Changeset 5985

Timestamp:

12/21/08 21:22:44 (7 months ago)

Author:

jeresig

Message:

Added the new jQuery.support object and removed all uses of jQuery.browser from within jQuery itself (while simultaneously deprecating the use of jQuery.browser).

Location:

trunk/jquery

Files:

• build.xml (modified) (1 diff)
• Makefile (modified) (1 diff)
• src/ajax.js (modified) (2 diffs)
• src/core.js (modified) (17 diffs)
• src/dimensions.js (modified) (1 diff)
• src/event.js (modified) (2 diffs)

trunk/jquery/build.xml

@@ -36 +36 @@
             <fileset dir="${SRC_DIR}" includes="intro.js" />
             <fileset dir="${SRC_DIR}" includes="core.js" />
+            <fileset dir="${SRC_DIR}" includes="support.js" />
             <fileset dir="${SRC_DIR}" includes="selector.js" />
             <fileset dir="${SRC_DIR}" includes="event.js" />

trunk/jquery/Makefile

@@ -10 +10 @@
 
 BASE_FILES = ${SRC_DIR}/core.js\
+    ${SRC_DIR}/support.js\
     ${SRC_DIR}/selector.js\
     ${SRC_DIR}/event.js\

trunk/jquery/src/ajax.js

@@ -460 +460 @@
             // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
             return !xhr.status && location.protocol == "file:" ||
-                ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223 ||
-                jQuery.browser.safari && xhr.status === undefined;
+                ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223;
         } catch(e){}
         return false;
@@ -472 +471 @@
 
             // Firefox always returns 200. check Last-Modified date
-            return xhr.status == 304 || xhrRes == jQuery.lastModified[url] ||
-                jQuery.browser.safari && xhr.status === undefined;
+            return xhr.status == 304 || xhrRes == jQuery.lastModified[url];
         } catch(e){}
         return false;

trunk/jquery/src/core.js

@@ -286 +286 @@
         // Do the clone
         var ret = this.map(function(){
-            if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) {
+            if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
                 // IE copies events bound via attachEvent when
                 // using cloneNode. Calling detachEvent on the
@@ -643 +643 @@
 
             script.type = "text/javascript";
-            if ( jQuery.browser.msie )
+            if ( jQuery.support.scriptEval )
+                script.appendChild( document.createTextNode( data ) );
+            else
                 script.text = data;
-            else
-                script.appendChild( document.createTextNode( data ) );
 
             // Use insertBefore instead of appendChild  to circumvent an IE6 bug.
@@ -835 +835 @@
         var ret, style = elem.style;
 
-        // A helper method for determining if an element's values are broken
-        function color( elem ) {
-            if ( !jQuery.browser.safari )
-                return false;
-
-            // defaultView is cached
-            var ret = defaultView.getComputedStyle( elem, null );
-            return !ret || ret.getPropertyValue("color") == "";
-        }
-
         // We need to handle opacity special in IE
-        if ( name == "opacity" && jQuery.browser.msie ) {
+        if ( name == "opacity" && !jQuery.support.opacity ) {
             ret = jQuery.attr( style, "opacity" );
 
@@ -853 +843 @@
                 ret;
         }
-        // Opera sometimes will give the wrong display answer, this fixes it, see #2037
-        if ( jQuery.browser.opera && name == "display" ) {
-            var save = style.outline;
-            style.outline = "0 solid black";
-            style.outline = save;
-        }
 
         // Make sure we're using the right name for getting the float value
@@ -877 +861 @@
             var computedStyle = defaultView.getComputedStyle( elem, null );
 
-            if ( computedStyle && !color( elem ) )
+            if ( computedStyle )
                 ret = computedStyle.getPropertyValue( name );
-
-            // If the element isn't reporting its values properly in Safari
-            // then some display: none elements are involved
-            else {
-                var swap = [], stack = [], a = elem, i = 0;
-
-                // Locate all of the parent display: none elements
-                for ( ; a && color(a); a = a.parentNode )
-                    stack.unshift(a);
-
-                // Go through and make them visible, but in reverse
-                // (It would be better if we knew the exact display type that they had)
-                for ( ; i < stack.length; i++ )
-                    if ( color( stack[ i ] ) ) {
-                        swap[ i ] = stack[ i ].style.display;
-                        stack[ i ].style.display = "block";
-                    }
-
-                // Since we flip the display style, we have to handle that
-                // one special, otherwise get the value
-                ret = name == "display" && swap[ stack.length - 1 ] != null ?
-                    "none" :
-                    ( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
-
-                // Finally, revert the display styles back
-                for ( i = 0; i < swap.length; i++ )
-                    if ( swap[ i ] != null )
-                        stack[ i ].style.display = swap[ i ];
-            }
 
             // We should always get a number back from opacity
@@ -992 +947 @@
 
                     // IE can't serialize <link> and <script> tags normally
-                    jQuery.browser.msie &&
+                    !jQuery.support.htmlSerialize &&
                     [ 1, "div<div>", "</div>" ] ||
 
@@ -1005 +960 @@
 
                 // Remove IE's autoinserted <tbody> from table fragments
-                if ( jQuery.browser.msie ) {
+                if ( !jQuery.support.tbody ) {
 
                     // String was a <table>, *may* have spurious <tbody>
@@ -1020 +975 @@
                             tbody[ j ].parentNode.removeChild( tbody[ j ] );
 
-                    // IE completely kills leading whitespace when innerHTML is used
-                    if ( /^\s/.test( elem ) )
-                        div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
-
-                }
+                    }
+
+                // IE completely kills leading whitespace when innerHTML is used
+                if ( !jQuery.support.leadingWhitespace && /^\s/.test( elem ) )
+                    div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
                 
                 if ( fragment ) {
@@ -1069 +1024 @@
         var notxml = !jQuery.isXMLDoc( elem ),
             // Whether we are setting (or getting)
-            set = value !== undefined,
-            msie = jQuery.browser.msie;
+            set = value !== undefined;
 
         // Try to normalize/fix the name
@@ -1084 +1038 @@
             // Safari mis-reports the default selected property of a hidden option
             // Accessing the parent's selectedIndex property fixes it
-            if ( name == "selected" && jQuery.browser.safari )
+            if ( name == "selected" )
                 elem.parentNode.selectedIndex;
 
@@ -1104 +1058 @@
             }
 
-            if ( msie && notxml &&  name == "style" )
+            if ( !jQuery.support.style && notxml &&  name == "style" )
                 return jQuery.attr( elem.style, "cssText", value );
 
@@ -1111 +1065 @@
                 elem.setAttribute( name, "" + value );
 
-            var attr = msie && notxml && special
+            var attr = !jQuery.support.hrefNormalized && notxml && special
                     // Some attributes require a special call on IE
                     ? elem.getAttribute( name, 2 )
@@ -1123 +1077 @@
 
         // IE uses filters for opacity
-        if ( msie && name == "opacity" ) {
+        if ( !jQuery.support.opacity && name == "opacity" ) {
             if ( set ) {
                 // IE has trouble with opacity if it does not have layout
@@ -1184 +1138 @@
         // Also, we need to make sure that the correct elements are being returned
         // (IE returns comment nodes in a '*' query)
-        if ( jQuery.browser.msie ) {
+        if ( !jQuery.support.getAll ) {
             while ( (elem = second[ i++ ]) )
                 if ( elem.nodeType != 8 )
@@ -1244 +1198 @@
     }
 });
+
+// Use of jQuery.browser is deprecated.
+// It's included for backwards compatibility and plugins,
+// although they should work to migrate away.
 
 var userAgent = navigator.userAgent.toLowerCase();
@@ -1256 +1214 @@
 };
 
-var styleFloat = jQuery.browser.msie ?
-    "styleFloat" :
-    "cssFloat";
-
-jQuery.extend({
-    // Check to see if the W3C box model is being used
-    boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
-
-    props: {
-        "for": "htmlFor",
-        "class": "className",
-        "float": styleFloat,
-        cssFloat: styleFloat,
-        styleFloat: styleFloat,
-        readonly: "readOnly",
-        maxlength: "maxLength",
-        cellspacing: "cellSpacing",
-        rowspan: "rowSpan"
-    }
-});
+// Check to see if the W3C box model is being used
+jQuery.boxModel = !jQuery.browser.msie || document.compatMode == "CSS1Compat";
 
 jQuery.each({
@@ -1360 +1300 @@
 });
 
-jQuery.each([ "Height", "Width" ], function(i, name){
-    var type = name.toLowerCase();
-
-    jQuery.fn[ type ] = function( size ) {
-        // Get window width or height
-        return this[0] == window ?
-            // Opera reports document.body.client[Width/Height] properly in both quirks and standards
-            jQuery.browser.opera && document.body.parentNode[ "client" + name ] ||
-
-            // Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
-            jQuery.browser.safari && window[ "inner" + name ] ||
-
-            // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-            document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :
-
-            // Get document width or height
-            this[0] == document ?
-                // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-                Math.max(
-                    Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]),
-                    Math.max(document.body["offset" + name], document.documentElement["offset" + name])
-                ) :
-
-                // Get or set width or height on the element
-                size === undefined ?
-                    // Get width or height on the element
-                    (this.length ? jQuery.css( this[0], type ) : null) :
-
-                    // Set the width or height on the element (default to pixels if value is unitless)
-                    this.css( type, typeof size === "string" ? size : size + "px" );
-    };
-});
-
 // Helper function used by the dimensions and offset modules
 function num(elem, prop) {

trunk/jquery/src/dimensions.js

@@ -20 +20 @@
                 num(this, "margin" + tl) + num(this, "margin" + br) : 0);
     };
+    
+    var type = name.toLowerCase();
+
+    jQuery.fn[ type ] = function( size ) {
+        // Get window width or height
+        return this[0] == window ?
+            // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+            document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] ||
+            document.body[ "client" + name ] :
+
+            // Get document width or height
+            this[0] == document ?
+                // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+                Math.max(
+                    document.documentElement["client" + name],
+                    document.body["scroll" + name], document.documentElement["scroll" + name],
+                    document.body["offset" + name], document.documentElement["offset" + name]
+                ) :
+
+                // Get or set width or height on the element
+                size === undefined ?
+                    // Get width or height on the element
+                    (this.length ? jQuery.css( this[0], type ) : null) :
+
+                    // Set the width or height on the element (default to pixels if value is unitless)
+                    this.css( type, typeof size === "string" ? size : size + "px" );
+    };
 
 });

trunk/jquery/src/event.js

@@ -14 +14 @@
         // For whatever reason, IE has trouble passing the window object
         // around, causing it to be cloned in the process
-        if ( jQuery.browser.msie && elem.setInterval )
+        if ( elem.setInterval && elem != window )
             elem = window;
 
@@ -384 +384 @@
 }
 
-if ( !jQuery.browser.msie ){    
-    // Checks if an event happened on an element within another element
-    // Used in jQuery.event.special.mouseenter and mouseleave handlers
-    var withinElement = function(event) {
-        // Check if mouse(over|out) are still within the same parent element
-        var parent = event.relatedTarget;
-        // Traverse up the tree
-        while ( parent && parent != this )
-            try { parent = parent.parentNode; }
-            catch(e) { parent = this; }
-        
-        if( parent != this ){
-            // set the correct event type
-            event.type = event.data;
-            // handle event if we actually just moused on to a non sub-element
-            jQuery.event.handle.apply( this, arguments );
-        }
-    };
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function(event) {
+    // Check if mouse(over|out) are still within the same parent element
+    var parent = event.relatedTarget;
+    // Traverse up the tree
+    while ( parent && parent != this )
+        try { parent = parent.parentNode; }
+        catch(e) { parent = this; }
     
-    jQuery.each({ 
-        mouseover: 'mouseenter', 
-        mouseout: 'mouseleave'
-    }, function( orig, fix ){
-        jQuery.event.special[ fix ] = {
-            setup: function(){
-                jQuery.event.add( this, orig, withinElement, fix );
-            },
-            teardown: function(){
-                jQuery.event.remove( this, orig, withinElement );
-            }
-        };             
-    });
-}
+    if( parent != this ){
+        // set the correct event type
+        event.type = event.data;
+        // handle event if we actually just moused on to a non sub-element
+        jQuery.event.handle.apply( this, arguments );
+    }
+};
+    
+jQuery.each({ 
+    mouseover: 'mouseenter', 
+    mouseout: 'mouseleave'
+}, function( orig, fix ){
+    jQuery.event.special[ fix ] = {
+        setup: function(){
+            jQuery.event.add( this, orig, withinElement, fix );
+        },
+        teardown: function(){
+            jQuery.event.remove( this, orig, withinElement );
+        }
+    };             
+});
 
 jQuery.fn.extend({