Changeset 4132

Timestamp:

12/13/07 02:00:33 (1 year ago)

Author:

brandon.aaron

Message:

Updating events_enhancement branch to latest version of trunk

Location:

branches/event_enhancements

Files:

• build/speed/benchmarker.js (modified) (3 diffs)
• build/speed/index.html (modified) (3 diffs)
• build/speed/jquery-1.1.2.js (deleted)
• build/speed/jquery-1.2.1.js (copied) (copied from trunk/jquery/build/speed/jquery-1.2.1.js)
• build/speed/jquery-basis.js (copied) (copied from trunk/jquery/build/speed/jquery-basis.js)
• src/ajax.js (modified) (5 diffs)
• src/core.js (modified) (26 diffs)
• src/event.js (modified) (9 diffs)
• src/fx.js (modified) (8 diffs)
• src/offset.js (modified) (5 diffs)
• src/selector.js (modified) (6 diffs)
• test/data/iframe.html (copied) (copied from trunk/jquery/test/data/iframe.html)
• test/data/json_assigned_obj.js (copied) (copied from trunk/jquery/test/data/json_assigned_obj.js)
• test/data/offset (copied) (copied from trunk/jquery/test/data/offset)
• test/data/offset/absolute.html (copied) (copied from trunk/jquery/test/data/offset/absolute.html)
• test/data/offset/fixed.html (copied) (copied from trunk/jquery/test/data/offset/fixed.html)
• test/data/offset/relative.html (copied) (copied from trunk/jquery/test/data/offset/relative.html)
• test/data/offset/scroll.html (copied) (copied from trunk/jquery/test/data/offset/scroll.html)
• test/data/offset/static.html (copied) (copied from trunk/jquery/test/data/offset/static.html)
• test/data/offset/table.html (copied) (copied from trunk/jquery/test/data/offset/table.html)
• test/data/testrunner.js (modified) (1 diff)
• test/data/testsuite.css (modified) (2 diffs)
• test/index.html (modified) (3 diffs)
• test/offset.html (copied) (copied from trunk/jquery/test/offset.html)
• test/unit/ajax.js (modified) (15 diffs)
• test/unit/core.js (modified) (36 diffs)
• test/unit/event.js (modified) (11 diffs)
• test/unit/fx.js (modified) (4 diffs)
• test/unit/offset.js (copied) (copied from trunk/jquery/test/unit/offset.js)
• version.txt (modified) (1 diff)

branches/event_enhancements/build/speed/benchmarker.js

@@ -21 +21 @@
       } catch(e) { }
     })
-    var times = 5;
-    jQuery("#times").html(times);
+    // set # times to run the test in index.html
+    var times = parseInt(jQuery("#times").val());
     jQuery.benchmarker.startingList = this.get();
     benchmark(this.get(), times, jQuery.benchmarker.libraries);
@@ -34 +34 @@
     jQuery("td.test").before("<td><input type='checkbox' checked='checked' /></td>");
     jQuery("button.runTests").bind("click", function() {
-      jQuery('td[input:checked] + td.test').benchmark();
+      jQuery('td:has(input:checked) + td.test').benchmark();
     });
 
-    jQuery("button.retryTies").bind("click", function() { jQuery("tr[td.tie] td.test").benchmark() })
+    jQuery("button.retryTies").bind("click", function() { jQuery("tr:has(td.tie) td.test").benchmark() })
 
     jQuery("button.selectAll").bind("click", function() { jQuery("input[@type=checkbox]").each(function() { this.checked = true }) })
@@ -53 +53 @@
     })
 
-    var headers = jQuery.map(jQuery.benchmarker.libraries, function(i) {
-      return "<th>" + i + "</th>"
+    var headers = jQuery.map(jQuery.benchmarker.libraries, function(i,n) {
+      var extra = n == 0 ? "basis - " : "";
+      return "<th>" + extra + i + "</th>"
     }).join("");
 

branches/event_enhancements/build/speed/index.html

@@ -6 +6 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>Speed Test</title>
-    <script src="../dist/jquery.js" type="text/javascript"></script>
-    <script src="jquery-1.1.2.js" type="text/javascript"></script>
+    <script src="jquery-basis.js" type="text/javascript"></script>
+    <script src="../../dist/jquery.js" type="text/javascript"></script>
+  <script type="text/javascript">
+     jQuery.noConflict();
+  </script>
     <link rel="stylesheet" href="benchmarker.css" type="text/css" media="screen" />
 </head>
@@ -16 +19 @@
 <div id="badid"></div>
 <div id="time-test">
-<p>Using the following selector expressions (<span id="times">5</span> times each):</p>
+<p>Using the following selector expressions (<input type="text" id="times" maxlength="5" size="5" value="20"/> times each):</p>
 <p>NOTE: Number shown is an average.</p>
 <div class="buttons">
@@ -503 +506 @@
 </div>
     <script type="text/javascript" charset="utf-8">
-            jQuery.benchmarker = {libraries: ["jQOld", "jQuery"]};
+            jQuery.benchmarker = {libraries: ["$", "jQuery"]};
     </script>
 

branches/event_enhancements/src/ajax.js

@@ -53 +53 @@
                         res.responseText );
 
-                // Add delay to account for Safari's delay in globalEval
-                setTimeout(function(){
-                    self.each( callback, [res.responseText, status, res] );
-                }, 13);
+                self.each( callback, [res.responseText, status, res] );
             }
         });
@@ -201 +198 @@
             s.cache = false;
 
-        if ( s.cache === false && s.type.toLowerCase() == "get" )
-            s.url += (s.url.match(/\?/) ? "&" : "?") + "_=" + (new Date()).getTime();
+        if ( s.cache === false && s.type.toLowerCase() == "get" ) {
+            var ts = (new Date()).getTime();
+            // try replacing _= if it is there
+            var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
+            // if nothing was replaced, add timestamp to the end
+            s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
+        }
 
         // If data is available, append data to url for get requests
@@ -217 +219 @@
 
         // If we're requesting a remote document
-        // and trying to load JSON or Script
-        if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+        // and trying to load JSON or Script with a GET
+        if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && ( s.dataType == "script" || s.dataType =="json" ) && s.type.toLowerCase() == "get" ) {
             var head = document.getElementsByTagName("head")[0];
             var script = document.createElement("script");
@@ -271 +273 @@
             
         if ( s.global )
-            jQuery.event.trigger("ajaxSend", [xml, s]);
+            jQuery.event.trigger("ajaxSend", [xml, s]);
 
         // Wait for a response to come back
@@ -398 +400 @@
     httpSuccess: function( r ) {
         try {
+            // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
             return !r.status && location.protocol == "file:" ||
-                ( r.status >= 200 && r.status < 300 ) || r.status == 304 ||
+                ( r.status >= 200 && r.status < 300 ) || r.status == 304 || r.status == 1223 ||
                 jQuery.browser.safari && r.status == undefined;
         } catch(e){}

branches/event_enhancements/src/core.js

@@ -15 +15 @@
 
 var jQuery = window.jQuery = function( selector, context ) {
-    // If the context is a namespace object, return a new object
-    return this instanceof jQuery ?
-        this.init( selector, context ) :
-        new jQuery( selector, context );
+    // The jQuery object is actually just the init constructor 'enhanced'
+    return new jQuery.prototype.init( selector, context );
 };
 
@@ -37 +35 @@
         selector = selector || document;
 
+        // Handle $(DOMElement)
+        if ( selector.nodeType ) {
+            this[0] = selector;
+            this.length = 1;
+            return this;
+
         // Handle HTML strings
-        if ( typeof selector  == "string" ) {
+        } else if ( typeof selector == "string" ) {
             // Are we dealing with HTML string or an ID?
             var match = quickExpr.exec( selector );
@@ -189 +193 @@
 
     css: function( key, value ) {
+        // ignore negative width and height values
+        if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
+            value = undefined;
         return this.attr( key, value, "curCSS" );
     },
@@ -194 +201 @@
     text: function( text ) {
         if ( typeof text != "object" && text != null )
-            return this.empty().append( document.createTextNode( text ) );
+            return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
 
         var ret = "";
@@ -243 +250 @@
     append: function() {
         return this.domManip(arguments, true, false, function(elem){
-            this.appendChild( elem );
+            if (this.nodeType == 1)
+                this.appendChild( elem );
         });
     },
@@ -249 +257 @@
     prepend: function() {
         return this.domManip(arguments, true, true, function(elem){
-            this.insertBefore( elem, this.firstChild );
+            if (this.nodeType == 1)
+                this.insertBefore( elem, this.firstChild );
         });
     },
@@ -282 +291 @@
         // Do the clone
         var ret = this.map(function(){
-            return this.outerHTML ?
-                jQuery( this.outerHTML )[0] :
-                this.cloneNode( true );
+            if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) {
+                // IE copies events bound via attachEvent when
+                // using cloneNode. Calling detachEvent on the
+                // clone will also remove the events from the orignal
+                // In order to get around this, we use innerHTML.
+                // Unfortunately, this means some modifications to 
+                // attributes in IE that are actually only stored 
+                // as properties will not be copied (such as the
+                // the name attribute on an input).
+                var clone = this.cloneNode(true),
+                    container = document.createElement("div"),
+                    container2 = document.createElement("div");
+                container.appendChild(clone);
+                container2.innerHTML = container.innerHTML;
+                return container2.firstChild;
+            } else
+                return this.cloneNode(true);
         });
 
@@ -332 +355 @@
 
     add: function( selector ) {
-        return this.pushStack( jQuery.merge( 
+        return !selector ? this : this.pushStack( jQuery.merge( 
             this.get(),
             selector.constructor == String ? 
@@ -355 +378 @@
             if ( this.length ) {
                 var elem = this[0];
-                
+
                 // We need to handle select boxes special
                 if ( jQuery.nodeName( elem, "select" ) ) {
@@ -388 +411 @@
                 // Everything else, we just grab the value
                 } else
-                    return this[0].value.replace(/\r/g, "");
+                    return (this[0].value || "").replace(/\r/g, "");
 
             }
@@ -394 +417 @@
         } else
             return this.each(function(){
+                if ( this.nodeType != 1 )
+                    return;
+
                 if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
                     this.checked = (jQuery.inArray(this.value, value) >= 0 ||
@@ -460 +486 @@
 
             if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) )
-                obj = this.getElementsByTagName("tbody")[0] || this.appendChild( document.createElement("tbody") );
+                obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") );
 
             var scripts = jQuery( [] );
@@ -469 +495 @@
                     this;
 
+                // execute all scripts after the elements have been injected
                 if ( jQuery.nodeName( elem, "script" ) ) {
-
-                    // If scripts are waiting to be executed, wait on this script as well
-                    if ( scripts.length )
-                        scripts = scripts.add( elem );
-
-                    // If nothing is waiting to be executed, run immediately
-                    else
-                        evalScript( 0, elem );
-
+                    scripts = scripts.add( elem );
                 } else {
                     // Remove any inner scripts for later evaluation
@@ -493 +512 @@
     }
 };
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.prototype.init.prototype = jQuery.prototype;
 
 function evalScript( i, elem ) {
@@ -522 +544 @@
 
     // Handle case when target is a string or something (possible in deep copy)
-    if ( typeof target != "object" )
+    if ( typeof target != "object" && typeof target != "function" )
         target = {};
 
@@ -541 +563 @@
 
                 // Recurse if we're merging object values
-                if ( deep && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
+                if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
                     target[ name ] = jQuery.extend( target[ name ], options[ name ] );
 
@@ -583 +605 @@
 
     // Evalulates a script in a global context
-    // Evaluates Async. in Safari 2 :-(
     globalEval: function( data ) {
         data = jQuery.trim( data );
@@ -715 +736 @@
         add: function( elem, classNames ) {
             jQuery.each((classNames || "").split(/\s+/), function(i, className){
-                if ( !jQuery.className.has( elem.className, className ) )
+                if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
                     elem.className += (elem.className ? " " : "") + className;
             });
@@ -722 +743 @@
         // internal only, use removeClass("class")
         remove: function( elem, classNames ) {
-            elem.className = classNames != undefined ?
-                jQuery.grep(elem.className.split(/\s+/), function(className){
-                    return !jQuery.className.has( classNames, className );  
-                }).join(" ") :
-                "";
+            if (elem.nodeType == 1)
+                elem.className = classNames != undefined ?
+                    jQuery.grep(elem.className.split(/\s+/), function(className){
+                        return !jQuery.className.has( classNames, className );  
+                    }).join(" ") :
+                    "";
         },
 
@@ -750 +772 @@
     },
 
-    css: function( elem, name ) {
-        if ( name == "height" || name == "width" ) {
-            var old = {}, height, width;
-
-            // Revert the padding and border widths to get the
-            // correct height/width values
-            jQuery.each([ "Top", "Bottom", "Right", "Left" ], function(){
-                old[ "padding" + this ] = 0;
-                old[ "border" + this + "Width" ] = 0;
-            });
-
-            // Swap out the padding/border values temporarily
-            jQuery.swap( elem, old, function() {
-
-                // If the element is visible, then the calculation is easy
-                if ( jQuery( elem ).is(":visible") ) {
-                    height = elem.offsetHeight;
-                    width = elem.offsetWidth;
-
-                // Otherwise, we need to flip out more values
-                } else {
-                    elem = jQuery( elem.cloneNode(true) )
-                        .find(":radio").removeAttr("checked").removeAttr("defaultChecked").end()
-                        .css({
-                            visibility: "hidden",
-                            position: "absolute",
-                            display: "block",
-                            right: "0",
-                            left: "0"
-                        }).appendTo( elem.parentNode )[0];
-
-                    var position = jQuery.css( elem.parentNode, "position" ) || "static";
-                    if ( position == "static" )
-                        elem.parentNode.style.position = "relative";
-
-                    height = elem.clientHeight;
-                    width = elem.clientWidth;
-
-                    if ( position == "static" )
-                        elem.parentNode.style.position = "static";
-
-                    elem.parentNode.removeChild( elem );
-                }
-            });
-
-            return name == "height" ?
-                height :
-                width;
+    css: function( elem, name, force ) {
+        if ( name == "width" || name == "height" ) {
+            var width, height, props = { position: "absolute", visibility: "hidden", display:"block" };
+        
+            function getWH() {
+                width = elem.clientWidth;
+                height = elem.clientHeight;
+            }
+        
+            if ( jQuery(elem).is(":visible") )
+                getWH();
+            else
+                jQuery.swap( elem, props, getWH );
+
+            return name == "width" ? width : height;
         }
-
-        return jQuery.curCSS( elem, name );
+        
+        return jQuery.curCSS( elem, name, force );
     },
 
@@ -910 +899 @@
         var ret = [];
         context = context || document;
+        // !context.createElement fails in IE with an error but returns typeof 'object'
+        if (typeof context.createElement == 'undefined') 
+            context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
 
         jQuery.each(elems, function(i, elem){
@@ -1004 +996 @@
     
     attr: function( elem, name, value ) {
+        // don't set attributes on text and comment nodes
+        if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
+            return undefined;
+
         var fix = jQuery.isXMLDoc( elem ) ?
             {} :
@@ -1034 +1030 @@
                     throw "type property can't be changed";
 
-                elem.setAttribute( name, value );
+                // convert the value to a string (all browsers do this but IE) see #1070
+                elem.setAttribute( name, "" + value );
             }
 
@@ -1056 +1053 @@
                 }
     
-                return elem.filter ? 
+                return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
                     (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() :
                     "";
@@ -1256 +1253 @@
     removeAttr: function( name ) {
         jQuery.attr( this, name, "" );
-        this.removeAttribute( name );
+        if (this.nodeType == 1) 
+            this.removeAttribute( name );
     },
 
@@ -1316 +1314 @@
                 // Either scroll[Width/Height] or offset[Width/Height], whichever is greater (Mozilla reports scrollWidth the same as offsetWidth)
                 Math.max( document.body[ "scroll" + name ], document.body[ "offset" + name ] ) :
-        
+
                 // Get or set width or height on the element
                 size == undefined ?

branches/event_enhancements/src/event.js

@@ -9 +9 @@
     // Original by Dean Edwards
     add: function(element, types, handler, data) {
+        if ( element.nodeType == 3 || element.nodeType == 8 )
+            return;
+
         // For whatever reason, IE has trouble passing the window object
         // around, causing it to be cloned in the process
@@ -20 +23 @@
         // if data is passed, bind to handler 
         if( data != undefined ) { 
-            // Create temporary function pointer to original handler 
+            // Create temporary function pointer to original handler 
             var fn = handler; 
 
@@ -88 +91 @@
     // Detach an event or set of events from an element
     remove: function(element, types, handler) {
+        // don't do events on text and comment nodes
+        if ( element.nodeType == 3 || element.nodeType == 8 )
+            return;
+
         var events = jQuery.data(element, "events"), ret, index;
 
@@ -159 +166 @@
         // Handle triggering a single element
         } else {
+            // don't do events on text and comment nodes
+            if ( element.nodeType == 3 || element.nodeType == 8 )
+                return;
+
             var val, ret, fn = jQuery.isFunction( element[ type ] || null ),
                 // Check to see if we need to provide a fake event, or not
@@ -183 +194 @@
 
             // Handle triggering of extra function
-            if ( extra && extra.apply( element, data ) === false )
-                val = false;
+            if ( extra ) {
+                // call the extra function and tack the current return value on the end for possible inspection
+                var ret = extra.apply( element, data.concat( val ) );
+                // if anything is returned, give it precedence and have it overwrite the previous value
+                if (ret !== undefined)
+                    val = ret;
+            }
 
             // Trigger the native events (except for clicks on links)
             if ( fn && donative !== false && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
                 this.triggered = true;
-                element[ type ]();
+                try {
+                    element[ type ]();
+                // prevent IE from throwing an error for some hidden elements
+                } catch (e) {}
             }
 
@@ -280 +299 @@
             var doc = document.documentElement, body = document.body;
             event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0);
-            event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc.clientLeft || 0);
+            event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0);
         }
             
@@ -503 +522 @@
             
             // and execute the function
-            return args[this.lastToggle].apply( this, [event] ) || false;
+            return args[this.lastToggle].apply( this, arguments ) || false;
         });
     },