diff options
author | Chris Buechler <cmb@pfsense.org> | 2010-01-05 15:18:41 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2010-01-05 15:20:44 -0500 |
commit | 8803319ca4933bed3e5e49074546e65947957c36 (patch) | |
tree | e9c86c06e5d230acde0a1e99958c3d9b668cfb56 /usr/local/www | |
parent | da0ce7ee2cd0c8915b92f4ebfb5f46e620366ab3 (diff) | |
download | pfsense-8803319ca4933bed3e5e49074546e65947957c36.zip pfsense-8803319ca4933bed3e5e49074546e65947957c36.tar.gz |
fix conflict between domTT and prototype that was breaking javascript in a number of areas. Problem described here.
http://groups.google.com/group/dom-tooltip/browse_thread/thread/3f0ecf76e0755ffc?pli=1
Ticket #276 among others
Diffstat (limited to 'usr/local/www')
-rw-r--r-- | usr/local/www/javascript/domTT/domLib.js | 32 | ||||
-rw-r--r-- | usr/local/www/javascript/domTT/domTT.js | 8 | ||||
-rw-r--r-- | usr/local/www/javascript/scriptaculous/prototype.js | 1 |
3 files changed, 21 insertions, 20 deletions
diff --git a/usr/local/www/javascript/domTT/domLib.js b/usr/local/www/javascript/domTT/domLib.js index 2e1a900..517a67c 100644 --- a/usr/local/www/javascript/domTT/domLib.js +++ b/usr/local/www/javascript/domTT/domLib.js @@ -87,7 +87,7 @@ var domLib_collisionElements; var domLib_collisionsCached = false; var domLib_timeoutStateId = 0; -var domLib_timeoutStates = new Hash(); +var domLib_timeoutStates = new domTT_Hash(); // }}} // {{{ DOM enhancements @@ -128,9 +128,9 @@ function domLib_clone(obj) } // }}} -// {{{ class Hash() +// {{{ class domTT_Hash() -function Hash() +function domTT_Hash() { this.length = 0; this.numericLength = 0; @@ -150,7 +150,7 @@ function Hash() } // using prototype as opposed to inner functions saves on memory -Hash.prototype.get = function(in_key) +domTT_Hash.prototype.get = function(in_key) { if (typeof(this.elementData[in_key]) != 'undefined') { return this.elementData[in_key]; @@ -159,7 +159,7 @@ Hash.prototype.get = function(in_key) return null; } -Hash.prototype.set = function(in_key, in_value) +domTT_Hash.prototype.set = function(in_key, in_value) { if (typeof(in_value) != 'undefined') { @@ -178,7 +178,7 @@ Hash.prototype.set = function(in_key, in_value) return false; } -Hash.prototype.remove = function(in_key) +domTT_Hash.prototype.remove = function(in_key) { var tmp_value; if (typeof(this.elementData[in_key]) != 'undefined') @@ -196,17 +196,17 @@ Hash.prototype.remove = function(in_key) return tmp_value; } -Hash.prototype.size = function() +domTT_Hash.prototype.size = function() { return this.length; } -Hash.prototype.has = function(in_key) +domTT_Hash.prototype.has = function(in_key) { return typeof(this.elementData[in_key]) != 'undefined'; } -Hash.prototype.find = function(in_obj) +domTT_Hash.prototype.find = function(in_obj) { for (var tmp_key in this.elementData) { @@ -219,7 +219,7 @@ Hash.prototype.find = function(in_obj) return null; } -Hash.prototype.merge = function(in_hash) +domTT_Hash.prototype.merge = function(in_hash) { for (var tmp_key in in_hash.elementData) { @@ -236,7 +236,7 @@ Hash.prototype.merge = function(in_hash) } } -Hash.prototype.compare = function(in_hash) +domTT_Hash.prototype.compare = function(in_hash) { if (this.length != in_hash.length) { @@ -342,7 +342,7 @@ function domLib_detectCollisions(in_object, in_recover, in_useCache) if (!thisElement.hideList) { - thisElement.hideList = new Hash(); + thisElement.hideList = new domTT_Hash(); } thisElement.hideList.remove(in_object.id); @@ -387,7 +387,7 @@ function domLib_detectCollisions(in_object, in_recover, in_useCache) if (!thisElement.hideList) { - thisElement.hideList = new Hash(); + thisElement.hideList = new domTT_Hash(); } var selectOffsets = domLib_getOffsets(thisElement); @@ -462,7 +462,7 @@ function domLib_getOffsets(in_object, in_preserveScroll) offsetTop += 10; } - return new Hash( + return new domTT_Hash( 'left', offsetLeft, 'top', offsetTop, 'right', offsetLeft + originalWidth, @@ -504,7 +504,7 @@ function domLib_setTimeout(in_function, in_timeout, in_args) else { var id = domLib_timeoutStateId++; - var data = new Hash(); + var data = new domTT_Hash(); data.set('function', in_function); data.set('args', args); domLib_timeoutStates.set(id, data); @@ -540,7 +540,7 @@ function domLib_clearTimeout(in_id) function domLib_getEventPosition(in_eventObj) { - var eventPosition = new Hash('x', 0, 'y', 0, 'scrollX', 0, 'scrollY', 0); + var eventPosition = new domTT_Hash('x', 0, 'y', 0, 'scrollX', 0, 'scrollY', 0); // IE varies depending on standard compliance mode if (domLib_isIE) diff --git a/usr/local/www/javascript/domTT/domTT.js b/usr/local/www/javascript/domTT/domTT.js index 877b887..eae22fa 100644 --- a/usr/local/www/javascript/domTT/domTT.js +++ b/usr/local/www/javascript/domTT/domTT.js @@ -95,10 +95,10 @@ if (typeof(domTT_dragEnabled) == 'undefined') // }}} // {{{ globals (DO NOT EDIT) -var domTT_predefined = new Hash(); +var domTT_predefined = new domTT_Hash(); // tooltips are keyed on both the tip id and the owner id, // since events can originate on either object -var domTT_tooltips = new Hash(); +var domTT_tooltips = new domTT_Hash(); var domTT_lastOpened = 0; var domTT_documentLoaded = false; var domTT_mousePosition = null; @@ -211,7 +211,7 @@ function domTT_activate(in_this, in_event) } // setup the default options hash - var options = new Hash( + var options = new domTT_Hash( 'caption', '', 'content', '', 'clearMouse', true, @@ -946,7 +946,7 @@ function domTT_mousemove(in_owner, in_event) function domTT_addPredefined(in_id) { - var options = new Hash(); + var options = new domTT_Hash(); for (var i = 1; i < arguments.length; i += 2) { options.set(arguments[i], arguments[i + 1]); diff --git a/usr/local/www/javascript/scriptaculous/prototype.js b/usr/local/www/javascript/scriptaculous/prototype.js index 845ab7f..bfc9d7a 100644 --- a/usr/local/www/javascript/scriptaculous/prototype.js +++ b/usr/local/www/javascript/scriptaculous/prototype.js @@ -190,6 +190,7 @@ var Class = (function() { } function toQueryString(object) { + //console.debug(object); return $H(object).toQueryString(); } |