Fixed #2037 where Opera would mis-state the value of 'display' after an innerHTML...

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index a37ae78..c7f30d6 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -29,6 +29,9 @@ window.$ = jQuery;
 // (both of which we optimize for)
 var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
 
+// Is it a simple selector
+var isSimple = /^.[^:#\[\.]*$/;
+
 jQuery.fn = jQuery.prototype = {
        init: function( selector, context ) {
                // Make sure that a selection was provided
@@ -342,15 +345,16 @@ jQuery.fn = jQuery.prototype = {
        },
 
        not: function( selector ) {
-               return this.pushStack(
-                       selector.constructor == String &&
-                       jQuery.multiFilter( selector, this, true ) ||
-
-                       jQuery.grep(this, function(elem) {
-                               return selector.constructor == Array || selector.jquery ?
-                                       jQuery.inArray( elem, selector ) < 0 :
-                                       elem != selector;
-                       }) );
+               if ( selector.constructor == String )
+                       // test special case where just one selector is passed in
+                       if ( isSimple.test( selector ) )
+                               return this.pushStack( jQuery.multiFilter( selector, this, true ) );
+                       else
+                               selector = jQuery.multiFilter( selector, this );
+
+               return this.filter(function() {
+                       return jQuery.inArray( this, selector ) < 0;
+               });
        },
 
        add: function( selector ) {
@@ -414,31 +418,32 @@ jQuery.fn = jQuery.prototype = {
 
                        }
 
-               } else
-                       return this.each(function(){
-                               if ( this.nodeType != 1 )
-                                       return;
+               }
+
+               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 ||
-                                               jQuery.inArray(this.name, value) >= 0);
+                       if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
+                               this.checked = (jQuery.inArray(this.value, value) >= 0 ||
+                                       jQuery.inArray(this.name, value) >= 0);
 
-                               else if ( jQuery.nodeName( this, "select" ) ) {
-                                       var values = value.constructor == Array ?
-                                               value :
-                                               [ value ];
+                       else if ( jQuery.nodeName( this, "select" ) ) {
+                               var values = value.constructor == Array ?
+                                       value :
+                                       [ value ];
 
-                                       jQuery( "option", this ).each(function(){
-                                               this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
-                                                       jQuery.inArray( this.text, values ) >= 0);
-                                       });
+                               jQuery( "option", this ).each(function(){
+                                       this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
+                                               jQuery.inArray( this.text, values ) >= 0);
+                               });
 
-                                       if ( !values.length )
-                                               this.selectedIndex = -1;
+                               if ( !values.length )
+                                       this.selectedIndex = -1;
 
-                               } else
-                                       this.value = value;
-                       });
+                       } else
+                               this.value = value;
+               });
        },
        
        html: function( value ) {
@@ -811,6 +816,12 @@ jQuery.extend({
                                "1" :
                                ret;
                }
+               // Opera sometimes will give the wrong display answer, this fixes it, see #2037
+               if ( jQuery.browser.opera && name == "display" ) {
+                       var save = elem.style.display;
+                       elem.style.display = "block";
+                       elem.style.display = save;
+               }
                
                // Make sure we're using the right name for getting the float value
                if ( name.match( /float/i ) )
@@ -967,9 +978,9 @@ jQuery.extend({
                                                        div.childNodes :
                                                        [];
                                
-                                       for ( var i = tbody.length - 1; i >= 0 ; --i )
-                                               if ( jQuery.nodeName( tbody[ i ], "tbody" ) && !tbody[ i ].childNodes.length )
-                                                       tbody[ i ].parentNode.removeChild( tbody[ i ] );
+                                       for ( var j = tbody.length - 1; j >= 0 ; --j )
+                                               if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
+                                                       tbody[ j ].parentNode.removeChild( tbody[ j ] );
                                        
                                        // IE completely kills leading whitespace when innerHTML is used        
                                        if ( /^\s/.test( elem ) )       
@@ -1311,8 +1322,11 @@ jQuery.each([ "Height", "Width" ], function(i, name){
                
                        // Get document width or height
                        this[0] == document ?
-                               // 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 ] ) :
+                               // 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 ?