Merge branch 'bug7123' of http://github.com/csnover/jquery into csnover-bug7123
authorJohn Resig <jeresig@gmail.com>
Sat, 9 Oct 2010 20:27:59 +0000 (16:27 -0400)
committerJohn Resig <jeresig@gmail.com>
Sat, 9 Oct 2010 20:27:59 +0000 (16:27 -0400)
src/ajax.js
src/css.js
src/effects.js
src/support.js
test/data/testsuite.css
test/index.html
test/unit/css.js
test/unit/effects.js
test/unit/manipulation.js

index e615480..bd9fb45 100644 (file)
@@ -458,12 +458,14 @@ jQuery.extend({
                        }
                };
 
-               // Override the abort handler, if we can (IE doesn't allow it, but that's OK)
+               // Override the abort handler, if we can (IE 6 doesn't allow it, but that's OK)
                // Opera doesn't fire onreadystatechange at all on abort
                try {
                        var oldAbort = xhr.abort;
                        xhr.abort = function() {
-                               if ( xhr ) {
+                               // xhr.abort in IE7 is not a native JS function
+                               // and does not have a call property
+                               if ( xhr && oldAbort.call ) {
                                        oldAbort.call( xhr );
                                }
 
@@ -698,12 +700,12 @@ if ( window.ActiveXObject ) {
                if ( window.location.protocol !== "file:" ) {
                        try {
                                return new window.XMLHttpRequest();
-                       } catch(e) {}
+                       } catch(xhrError) {}
                }
 
                try {
                        return new window.ActiveXObject("Microsoft.XMLHTTP");
-               } catch(e) {}
+               } catch(activeError) {}
        };
 }
 
index 4bf818e..d0e55db 100644 (file)
@@ -70,7 +70,7 @@ jQuery.extend({
        style: function( elem, name, value, extra ) {
                // Don't set styles on text and comment nodes
                if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-                       return undefined;
+                       return;
                }
 
                // Make sure that we're working with the right name
@@ -81,6 +81,11 @@ jQuery.extend({
 
                // Check if we're setting a value
                if ( value !== undefined ) {
+                       // Make sure that NaN and null values aren't set. See: #7116
+                       if ( typeof value === "number" && isNaN( value ) || value == null ) {
+                               return;
+                       }
+
                        // If a number was passed in, add 'px' to the (except for certain CSS properties)
                        if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
                                value += "px";
@@ -88,7 +93,11 @@ jQuery.extend({
 
                        // If a hook was provided, use that value, otherwise just set the specified value
                        if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
-                               style[ name ] = value;
+                               // Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+                               // Fixes bug #5509
+                               try {
+                                       style[ name ] = value;
+                               } catch(e) {}
                        }
 
                } else {
@@ -280,14 +289,9 @@ function getWH( elem, name, extra ) {
 
 if ( jQuery.expr && jQuery.expr.filters ) {
        jQuery.expr.filters.hidden = function( elem ) {
-               var width = elem.offsetWidth, height = elem.offsetHeight,
-                       skip = elem.nodeName.toLowerCase() === "tr";
-
-               return width === 0 && height === 0 && !skip ?
-                       true :
-                       width > 0 && height > 0 && !skip ?
-                               false :
-                               (elem.style.display || jQuery.css( elem, "display" )) === "none";
+               var width = elem.offsetWidth, height = elem.offsetHeight;
+
+               return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
        };
 
        jQuery.expr.filters.visible = function( elem ) {
index 56141bb..241dbd0 100644 (file)
@@ -15,43 +15,28 @@ var elemdisplay = {},
 
 jQuery.fn.extend({
        show: function( speed, easing, callback ) {
-               if ( speed || speed === 0) {
+               if ( speed || speed === 0 ) {
                        return this.animate( genFx("show", 3), speed, easing, callback);
-
                } else {
-                       for ( var i = 0, l = this.length; i < l; i++ ) {
-                               var old = jQuery.data(this[i], "olddisplay");
-
-                               this[i].style.display = old || "";
-
-                               if ( jQuery.css( this[i], "display" ) === "none" ) {
-                                       var nodeName = this[i].nodeName, display;
-
-                                       if ( elemdisplay[ nodeName ] ) {
-                                               display = elemdisplay[ nodeName ];
-
-                                       } else {
-                                               var elem = jQuery("<" + nodeName + ">").appendTo("body");
-
-                                               display = elem.css("display");
-
-                                               if ( display === "none" ) {
-                                                       display = "block";
-                                               }
-
-                                               elem.remove();
-
-                                               elemdisplay[ nodeName ] = display;
-                                       }
+                       for ( var i = 0, j = this.length; i < j; i++ ) {
+                               // Reset the inline display of this element to learn if it is
+                               // being hidden by cascaded rules or not
+                               if ( !jQuery.data(this[i], "olddisplay") && this[i].style.display === "none" ) {
+                                       this[i].style.display = "";
+                               }
 
-                                       jQuery.data(this[i], "olddisplay", display);
+                               // Set elements which have been overridden with display: none
+                               // in a stylesheet to whatever the default browser style is
+                               // for such an element
+                               if ( this[i].style.display === "" && jQuery.css( this[i], "display" ) === "none" ) {
+                                       jQuery.data(this[i], "olddisplay", defaultDisplay(this[i].nodeName));
                                }
                        }
 
-                       // Set the display of the elements in a second loop
+                       // Set the display of most of the elements in a second loop
                        // to avoid the constant reflow
-                       for ( var j = 0, k = this.length; j < k; j++ ) {
-                               this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
+                       for ( i = 0; i < j; i++ ) {
+                               this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
                        }
 
                        return this;
@@ -63,17 +48,17 @@ jQuery.fn.extend({
                        return this.animate( genFx("hide", 3), speed, easing, callback);
 
                } else {
-                       for ( var i = 0, l = this.length; i < l; i++ ) {
+                       for ( var i = 0, j = this.length; i < j; i++ ) {
                                var old = jQuery.data(this[i], "olddisplay");
-                               if ( !old && old !== "none" ) {
+                               if ( !old ) {
                                        jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) );
                                }
                        }
 
                        // Set the display of the elements in a second loop
                        // to avoid the constant reflow
-                       for ( var j = 0, k = this.length; j < k; j++ ) {
-                               this[j].style.display = "none";
+                       for ( i = 0; i < j; i++ ) {
+                               this[i].style.display = "none";
                        }
 
                        return this;
@@ -115,8 +100,12 @@ jQuery.fn.extend({
                }
 
                return this[ optall.queue === false ? "each" : "queue" ](function() {
+                       // XXX ‘this’ does not always have a nodeName when running the
+                       // test suite
+
                        var opt = jQuery.extend({}, optall), p,
-                               hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
+                               isElement = this.nodeType === 1,
+                               hidden = isElement && jQuery(this).is(":hidden"),
                                self = this;
 
                        for ( p in prop ) {
@@ -132,12 +121,35 @@ jQuery.fn.extend({
                                        return opt.complete.call(this);
                                }
 
-                               if ( ( p === "height" || p === "width" ) && this.style ) {
-                                       // Store display property
-                                       opt.display = this.style.display;
-
+                               if ( isElement && ( p === "height" || p === "width" ) ) {
                                        // Make sure that nothing sneaks out
-                                       opt.overflow = this.style.overflow;
+                                       // Record all 3 overflow attributes because IE does not
+                                       // change the overflow attribute when overflowX and
+                                       // overflowY are set to the same value
+                                       opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+
+                                       // Set display property to inline-block for height/width
+                                       // animations on inline elements that are having width/height
+                                       // animated
+                                       if ( jQuery.css( this, "display" ) === "inline" &&
+                                                       jQuery.css( this, "float" ) === "none" ) {
+                                               if ( !jQuery.support.inlineBlockNeedsLayout ) {
+                                                       this.style.display = "inline-block";
+
+                                               } else {
+                                                       var display = defaultDisplay(this.nodeName);
+
+                                                       // inline-level elements accept inline-block;
+                                                       // block-level elements need to be inline with layout
+                                                       if ( display === "inline" ) {
+                                                               this.style.display = "inline-block";
+
+                                                       } else {
+                                                               this.style.display = "inline";
+                                                               this.style.zoom = 1;
+                                                       }
+                                               }
+                                       }
                                }
 
                                if ( jQuery.isArray( prop[p] ) ) {
@@ -303,11 +315,6 @@ jQuery.fx.prototype = {
                }
 
                (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-
-               // Set display property to block for height/width animations
-               if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) {
-                       this.elem.style.display = "block";
-               }
        },
 
        // Get the current size
@@ -384,17 +391,12 @@ jQuery.fx.prototype = {
                        }
 
                        if ( done ) {
-                               if ( this.options.display != null ) {
-                                       // Reset the overflow
-                                       this.elem.style.overflow = this.options.overflow;
-
-                                       // Reset the display
-                                       var old = jQuery.data(this.elem, "olddisplay");
-                                       this.elem.style.display = old ? old : this.options.display;
-
-                                       if ( jQuery.css( this.elem, "display" ) === "none" ) {
-                                               this.elem.style.display = "block";
-                                       }
+                               // Reset the overflow
+                               if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+                                       var elem = this.elem, options = this.options;
+                                       jQuery.each( [ "", "X", "Y" ], function (index, value) {
+                                               elem.style[ "overflow" + value ] = options.overflow[index];
+                                       } );
                                }
 
                                // Hide the element if the "hide" operation was done
@@ -447,14 +449,14 @@ jQuery.extend( jQuery.fx, {
                        jQuery.fx.stop();
                }
        },
-  
+
        interval: 13,
-               
+
        stop: function() {
                clearInterval( timerId );
                timerId = null;
        },
-       
+
        speeds: {
                slow: 600,
                fast: 200,
@@ -485,4 +487,21 @@ if ( jQuery.expr && jQuery.expr.filters ) {
        };
 }
 
+function defaultDisplay( nodeName ) {
+       if ( !elemdisplay[ nodeName ] ) {
+               var elem = jQuery("<" + nodeName + ">").appendTo("body"),
+                       display = elem.css("display");
+
+               elem.remove();
+
+               if ( display === "none" || display === "" ) {
+                       display = "block";
+               }
+
+               elemdisplay[ nodeName ] = display;
+       }
+
+       return elemdisplay[ nodeName ];
+}
+
 })( jQuery );
index d35dbed..c2ffa45 100644 (file)
                checkClone: false,
                scriptEval: false,
                noCloneEvent: true,
-               boxModel: null
+               boxModel: null,
+               inlineBlockNeedsLayout: false,
+               shrinkWrapBlocks: false,
+               reliableHiddenOffsets: true
        };
 
        // Make sure that the options inside disabled selects aren't marked as disabled
 
                document.body.appendChild( div );
                jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
-               document.body.removeChild( div ).style.display = 'none';
-               div = null;
+
+               if ( "zoom" in div.style ) {
+                       // Check if natively block-level elements act like inline-block
+                       // elements when setting their display to 'inline' and giving
+                       // them layout
+                       // (IE < 8 does this)
+                       div.style.display = "inline";
+                       div.style.zoom = 1;
+                       jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
+
+                       // Check if elements with layout shrink-wrap their children
+                       // (IE 6 does this)
+                       div.style.display = "";
+                       div.innerHTML = "<div style='width:4px;'></div>";
+                       jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
+               }
+
+               div.innerHTML = "<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";
+               var tds = div.getElementsByTagName("td");
+
+               // Check if table cells still have offsetWidth/Height when they are set
+               // to display:none and there are still other visible table cells in a
+               // table row; if so, offsetWidth/Height are not reliable for use when
+               // determining if an element has been hidden directly using
+               // display:none (it is still safe to use offsets if a parent element is
+               // hidden; don safety goggles and see bug #4512 for more information).
+               // (only IE 8 fails this test)
+               jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
+
+               tds[0].style.display = "";
+               tds[1].style.display = "none";
+
+               // Check if empty table cells still have offsetWidth/Height
+               // (IE < 8 fail this test)
+               jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
+               div.innerHTML = "";
+
+               document.body.removeChild( div ).style.display = "none";
+               div = tds = null;
        });
 
        // Technique from Juriy Zaytsev
        // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
-       var eventSupported = function( eventName ) { 
-               var el = document.createElement("div"); 
-               eventName = "on" + eventName; 
-
-               var isSupported = (eventName in el); 
-               if ( !isSupported ) { 
-                       el.setAttribute(eventName, "return;"); 
-                       isSupported = typeof el[eventName] === "function"; 
-               } 
-               el = null; 
-
-               return isSupported; 
+       var eventSupported = function( eventName ) {
+               var el = document.createElement("div");
+               eventName = "on" + eventName;
+
+               var isSupported = (eventName in el);
+               if ( !isSupported ) {
+                       el.setAttribute(eventName, "return;");
+                       isSupported = typeof el[eventName] === "function";
+               }
+               el = null;
+
+               return isSupported;
        };
-       
+
        jQuery.support.submitBubbles = eventSupported("submit");
        jQuery.support.changeBubbles = eventSupported("change");
 
index 1846892..cffaaa4 100644 (file)
@@ -102,6 +102,8 @@ div.chain.test div { background: green; }
 div.chain.out { background: green; }
 div.chain.out div { background: red; display: none; }
 
+/* tests to ensure jQuery can determine the native display mode of elements
+   that have been set as display: none in stylesheets */
 div#show-tests * { display: none; }
 
 #nothiddendiv { font-size: 16px; }
index d858114..03e1d97 100644 (file)
        <div id="qunit-testrunner-toolbar"></div>
        <h2 id="qunit-userAgent"></h2>
        <ol id="qunit-tests"></ol>
-       
+
        <!-- Test HTML -->
        <div id="nothiddendiv" style="height:1px;background:white;" class="nothiddendiv">
                <div id="nothiddendivchild"></div>
        </div>
        <!-- this iframe is outside the #main so it won't reload constantly wasting time, but it means the tests must be "safe" and clean up after themselves -->
        <iframe id="loadediframe" name="loadediframe" style="display:none;" src="data/iframe.html"></iframe>
-       <dl id="dl" style="display:none;">
-       <div id="main" style="display: none;">
+       <dl id="dl" style="position:absolute;top:-32767px;left:-32767px;">
+       <div id="main">
                <p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
                <p id="ap">
-                       Here are some links in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>, 
-                       <a id="groups" href="http://groups.google.com/" class="GROUPS">Google Groups (Link)</a>. 
-                       This link has <code><a href="http://smin" id="anchor1">class="blog"</a></code>: 
+                       Here are some links in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>,
+                       <a id="groups" href="http://groups.google.com/" class="GROUPS">Google Groups (Link)</a>.
+                       This link has <code><a href="http://smin" id="anchor1">class="blog"</a></code>:
                        <a href="http://diveintomark.org/" class="blog" hreflang="en" id="mark">diveintomark</a>
 
                </p>
 
                        <input type="hidden" name="hidden" id="hidden1"/>
                        <input type="text" style="display:none;" name="foo[bar]" id="hidden2"/>
-                       
+
                        <input type="text" id="name" name="name" value="name" />
                        <input type="search" id="search" name="search" value="search" />
-                       
+
                        <button id="button" name="button" type="button">Button</button>
-                       
+
                        <textarea id="area1" maxlength="30">foobar</textarea>
-                       
+
                        <select name="select1" id="select1">
                                <option id="option1a" class="emptyopt" value="">Nothing</option>
                                <option id="option1b" value="1">1</option>
                                <option id="option5b" value="2">2</option>
                                <option id="option5c" value="1">3</option>
                        </select>
-                       
+
                        <object id="object1" codebase="stupid">
                                <param name="p1" value="x1" />
                                <param name="p2" value="x2" />
                        </object>
-                       
+
                        <span id="台北Táiběi"></span>
                        <span id="台北" lang="中文"></span>
                        <span id="utf8class1" class="台北Táiběi 台北"></span>
                        <span id="utf8class2" class="台北"></span>
                        <span id="foo:bar" class="foo:bar"></span>
                        <span id="test.foo[5]bar" class="test.foo[5]bar"></span>
-                       
+
                        <foo_bar id="foobar">test element</foo_bar>
                </form>
                <b id="floatTest">Float test.</b>
                        <input name="types[]" id="types_anime" type="checkbox" value="anime" />
                        <input name="types[]" id="types_movie" type="checkbox" value="movie" />
                </form>
-               
+
                <form id="testForm" action="#" method="get">
                        <textarea name="T3" rows="2" cols="15">?
 Z</textarea>
@@ -213,7 +213,7 @@ Z</textarea>
                                <div><div class="hidden">hidden</div></div>
                        </div>
                </div>
-               
+
                <div id="tabindex-tests">
                        <ol id="listWithTabIndex" tabindex="5">
                                <li id="foodWithNegativeTabIndex" tabindex="-1">Rice</li>
@@ -221,7 +221,7 @@ Z</textarea>
                                <li>Blinis</li>
                                <li>Tofu</li>
                        </ol>
-               
+
                        <div id="divWithNoTabIndex">I'm hungry. I should...</div>
                        <span>...</span><a href="#" id="linkWithNoTabIndex">Eat lots of food</a><span>...</span> |
                        <span>...</span><a href="#" id="linkWithTabIndex" tabindex="2">Eat a little food</a><span>...</span> |
@@ -230,7 +230,7 @@ Z</textarea>
                        <span>...</span><a id="linkWithNoHrefWithTabIndex" tabindex="1">Eat some funyuns</a><span>...</span>
                        <span>...</span><a id="linkWithNoHrefWithNegativeTabIndex" tabindex="-1">Eat some funyuns</a><span>...</span>
                </div>
-               
+
                <div id="liveHandlerOrder">
                        <span id="liveSpan1"><a href="#" id="liveLink1"></a></span>
                        <span id="liveSpan2"><a href="#" id="liveLink2"></a></span>
@@ -246,23 +246,23 @@ Z</textarea>
                <div id="fx-queue" name="test">
                        <div id="fadein" class='chain test' name='div'>fadeIn<div>fadeIn</div></div>
                        <div id="fadeout" class='chain test out'>fadeOut<div>fadeOut</div></div>
-                       
+
                        <div id="show" class='chain test'>show<div>show</div></div>
                        <div id="hide" class='chain test out'>hide<div>hide</div></div>
-                       
+
                        <div id="togglein" class='chain test'>togglein<div>togglein</div></div>
                        <div id="toggleout" class='chain test out'>toggleout<div>toggleout</div></div>
-               
-                       
+
+
                        <div id="slideup" class='chain test'>slideUp<div>slideUp</div></div>
                        <div id="slidedown" class='chain test out'>slideDown<div>slideDown</div></div>
-                       
+
                        <div id="slidetogglein" class='chain test'>slideToggleIn<div>slideToggleIn</div></div>
                        <div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div>
 
                        <div id="fadeto" class='chain test'>fadeTo<div>fadeTo</div></div>
                </div>
-               
+
                <div id="fx-tests"></div>
        </div>
 </body>
index 468f763..8a49096 100644 (file)
@@ -1,9 +1,9 @@
 module("css");
 
 test("css(String|Hash)", function() {
-       expect(29);
+       expect(33);
 
-       equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
+       equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"');
 
        ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
        jQuery('#nothiddendiv').css({display: 'none'});
@@ -61,10 +61,30 @@ test("css(String|Hash)", function() {
        equals( prctval, checkval, "Verify fontSize % set." );
 
        equals( typeof child.css("width"), "string", "Make sure that a string width is returned from css('width')." );
+
+       var old = child[0].style.height;
+
+       // Test NaN
+       child.css("height", parseFloat("zoo"));
+       equals( child[0].style.height, old, "Make sure height isn't changed on NaN." );
+
+       // Test null
+       child.css("height", null);
+       equals( child[0].style.height, old, "Make sure height isn't changed on null." );
+
+       old = child[0].style.fontSize;
+
+       // Test NaN
+       child.css("font-size", parseFloat("zoo"));
+       equals( child[0].style.fontSize, old, "Make sure font-size isn't changed on NaN." );
+
+       // Test null
+       child.css("font-size", null);
+       equals( child[0].style.fontSize, old, "Make sure font-size isn't changed on null." );
 });
 
 test("css(String, Object)", function() {
-       expect(21);
+       expect(22);
 
        ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
        jQuery('#nothiddendiv').css("display", 'none');
@@ -104,6 +124,16 @@ test("css(String, Object)", function() {
 
        equals( ret, div, "Make sure setting undefined returns the original set." );
        equals( div.css("display"), display, "Make sure that the display wasn't changed." );
+
+       // Test for Bug #5509
+       var success = true;
+       try {
+               jQuery('#foo').css("backgroundColor", "rgba(0, 0, 0, 0.1)");
+       }
+       catch (e) {
+               success = false;
+       }
+       ok( success, "Setting RGBA values does not throw Error" );
 });
 
 if(jQuery.browser.msie) {
@@ -256,3 +286,16 @@ test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", funct
        ok( !! jQuery(":checkbox:first", $checkedtest).attr("checked"), "Check first checkbox still checked." );
        ok( ! jQuery(":checkbox:last", $checkedtest).attr("checked"), "Check last checkbox still NOT checked." );
 });
+
+test(":visible selector works properly on table elements (bug #4512)", function () {
+       expect(1);
+
+       jQuery('#table').html('<tr><td style="display:none">cell</td><td>cell</td></tr>');
+       equals(jQuery('#table td:visible').length, 1, "hidden cell is not perceived as visible");
+});
+
+test(":visible selector works properly on children with a hidden parent (bug #4512)", function () {
+       expect(1);
+       jQuery('#table').css('display', 'none').html('<tr><td>cell</td><td>cell</td></tr>');
+       equals(jQuery('#table td:visible').length, 0, "hidden cell children not perceived as visible");
+});
\ No newline at end of file
index b9d5c88..3c4015a 100644 (file)
@@ -1,5 +1,10 @@
 module("effects");
 
+test("sanity check", function() {
+       expect(1);
+       ok( jQuery("#dl:visible, #main:visible, #foo:visible").length === 3, "QUnit state is correct for testing effects" );
+});
+
 test("show()", function() {
        expect(23);
        var pass = true, div = jQuery("#main div");
@@ -32,9 +37,11 @@ test("show()", function() {
                ok( pass, "Show with " + name + " does not call animate callback" );
        });
 
-       jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
-
-       var old = jQuery("#show-tests table").show().css("display") !== "table";
+       // #show-tests * is set display: none in CSS
+       jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id="test-table"></table>');
+       
+       var old = jQuery("#test-table").show().css("display") !== "table";
+       jQuery("#test-table").remove();
 
        var test = {
                "div"      : "block",
@@ -64,10 +71,12 @@ test("show(Number) - other displays", function() {
        QUnit.reset();
        stop();
 
-       jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
+       // #show-tests * is set display: none in CSS
+       jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id="test-table"></table>');
 
-       var old = jQuery("#show-tests table").show().css("display") !== "table",
+       var old = jQuery("#test-table").show().css("display") !== "table",
                num = 0;
+       jQuery("#test-table").remove();
 
        var test = {
                "div"      : "block",
@@ -116,6 +125,104 @@ test("animate negative height", function() {
        });
 });
 
+test("animate block as inline width/height", function() {
+       expect(3);
+       stop();
+       jQuery("#foo").css({ display: "inline", width: '', height: '' }).animate({ width: 42, height: 42 }, 100, function() {
+               equals( jQuery(this).css("display"), jQuery.support.inlineBlockNeedsLayout ? "inline" : "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
+               equals( this.offsetWidth, 42, "width was animated" );
+               equals( this.offsetHeight, 42, "height was animated" );
+               start();
+       });
+});
+
+test("animate native inline width/height", function() {
+       expect(3);
+       stop();
+       jQuery("#foo").css({ display: "", width: '', height: '' })
+               .append('<span>text</span>')
+               .children('span')
+                       .animate({ width: 42, height: 42 }, 100, function() {
+                               equals( jQuery(this).css("display"), "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
+                               equals( this.offsetWidth, 42, "width was animated" );
+                               equals( this.offsetHeight, 42, "height was animated" );
+                               start();
+                       });
+});
+
+test("animate block width/height", function() {
+       expect(3);
+       stop();
+       jQuery("#foo").css({ display: "block", width: 20, height: 20 }).animate({ width: 42, height: 42 }, 100, function() {
+               equals( jQuery(this).css("display"), "block", "inline-block was not set on block element when animating width/height" );
+               equals( this.offsetWidth, 42, "width was animated" );
+               equals( this.offsetHeight, 42, "height was animated" );
+               start();
+       });
+});
+
+test("animate table width/height", function() {
+       expect(1);
+       stop();
+
+       var displayMode = jQuery("#table").css("display") !== "table" ? "block" : "table";
+
+       jQuery("#table").animate({ width: 42, height: 42 }, 100, function() {
+               equals( jQuery(this).css("display"), displayMode, "display mode is correct" );
+               start();
+       });
+});
+
+test("animate table-row width/height", function() {
+       expect(3);
+       stop();
+       var tr = jQuery("#table")
+               .attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
+               .html("<tr style='height:42px;'><td style='padding:0;'><div style='width:20px;height:20px;'></div></td></tr>")
+               .find("tr");
+
+       // IE<8 uses “block” instead of the correct display type
+       var displayMode = tr.css("display") !== "table-row" ? "block" : "table-row";
+
+       tr.animate({ width: 10, height: 10 }, 100, function() {
+               equals( jQuery(this).css("display"), displayMode, "display mode is correct" );
+               equals( this.offsetWidth, 20, "width animated to shrink wrap point" );
+               equals( this.offsetHeight, 20, "height animated to shrink wrap point" );
+               start();
+       });
+});
+
+test("animate table-cell width/height", function() {
+       expect(3);
+       stop();
+       var td = jQuery("#table")
+               .attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
+               .html("<tr><td style='width:42px;height:42px;padding:0;'><div style='width:20px;height:20px;'></div></td></tr>")
+               .find("td");
+
+       // IE<8 uses “block” instead of the correct display type
+       var displayMode = td.css("display") !== "table-cell" ? "block" : "table-cell";
+
+       td.animate({ width: 10, height: 10 }, 100, function() {
+               equals( jQuery(this).css("display"), displayMode, "display mode is correct" );
+               equals( this.offsetWidth, 20, "width animated to shrink wrap point" );
+               equals( this.offsetHeight, 20, "height animated to shrink wrap point" );
+               start();
+       });
+});
+
+test("animate resets overflow-x and overflow-y when finished", function() {
+       expect(2);
+       stop();
+       jQuery("#foo")
+               .css({ display: "block", width: 20, height: 20, overflowX: "visible", overflowY: "auto" })
+               .animate({ width: 42, height: 42 }, 100, function() {
+                       equals( this.style.overflowX, "visible", "overflow-x is visible" );
+                       equals( this.style.overflowY, "auto", "overflow-y is auto" );
+                       start();
+               });
+});
+
 /* // This test ends up being flaky depending upon the CPU load
 test("animate option (queue === false)", function () {
        expect(1);
@@ -139,7 +246,7 @@ test("animate option (queue === false)", function () {
 
 test("animate with no properties", function() {
        expect(2);
-       
+
        var divs = jQuery("div"), count = 0;
 
        divs.animate({}, function(){
@@ -161,30 +268,30 @@ test("animate with no properties", function() {
 
 test("animate duration 0", function() {
        expect(11);
-       
+
        stop();
-       
+
        var $elems = jQuery([{ a:0 },{ a:0 }]), counter = 0;
-       
+
        equals( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
-               
+
        $elems.eq(0).animate( {a:1}, 0, function(){
                ok( true, "Animate a simple property." );
                counter++;
        });
-       
+
        // Failed until [6115]
        equals( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" );
-       
+
        equals( counter, 1, "One synchronic animations" );
-       
+
        $elems.animate( { a:2 }, 0, function(){
                ok( true, "Animate a second simple property." );
                counter++;
        });
-       
+
        equals( counter, 3, "Multiple synchronic animations" );
-       
+
        $elems.eq(0).animate( {a:3}, 0, function(){
                ok( true, "Animate a third simple property." );
                counter++;
@@ -195,12 +302,12 @@ test("animate duration 0", function() {
                equals( counter, 5, "One synchronic and one asynchronic" );
                start();
        });
-       
+
        var $elem = jQuery("<div />");
-       $elem.show(0, function(){ 
+       $elem.show(0, function(){
                ok(true, "Show callback with no duration");
        });
-       $elem.hide(0, function(){ 
+       $elem.hide(0, function(){
                ok(true, "Hide callback with no duration");
        });
 });
@@ -342,7 +449,7 @@ test("toggle()", function() {
        ok( x.is(":hidden"), "is hidden" );
        x.toggle();
        ok( x.is(":visible"), "is visible again" );
-       
+
        x.toggle(true);
        ok( x.is(":visible"), "is visible" );
        x.toggle(false);
@@ -372,7 +479,7 @@ test("JS Overflow and Display", function() {
                .after("text after")
                .animate({ opacity: 0.5 }, "slow", jQuery.checkOverflowDisplay);
 });
-               
+
 test("CSS Overflow and Display", function() {
        expect(2);
        stop();
@@ -444,16 +551,16 @@ jQuery.each( {
        }, function(tn, t){
                test(fn + " to " + tn, function() {
                        var elem = jQuery.makeTest( fn + " to " + tn );
-       
+
                        var t_w = t( elem, "width" );
                        var f_w = f( elem, "width" );
                        var t_h = t( elem, "height" );
                        var f_h = f( elem, "height" );
                        var t_o = t( elem, "opacity" );
                        var f_o = f( elem, "opacity" );
-                       
+
                        var num = 0;
-                       
+
                        if ( t_h == "show" ) num++;
                        if ( t_w == "show" ) num++;
                        if ( t_w == "hide"||t_w == "show" ) num++;
@@ -463,52 +570,52 @@ jQuery.each( {
                        if ( t_o.constructor == Number ) num += 2;
                        if ( t_w.constructor == Number ) num += 2;
                        if ( t_h.constructor == Number ) num +=2;
-                       
+
                        expect(num);
                        stop();
-       
+
                        var anim = { width: t_w, height: t_h, opacity: t_o };
-       
+
                        elem.animate(anim, 50, function(){
                                if ( t_w == "show" )
                                        equals( this.style.display, "block", "Showing, display should block: " + this.style.display);
-                                       
+
                                if ( t_w == "hide"||t_w == "show" )
                                        ok(f_w === "" ? this.style.width === f_w : this.style.width.indexOf(f_w) === 0, "Width must be reset to " + f_w + ": " + this.style.width);
-                                       
+
                                if ( t_h == "hide"||t_h == "show" )
                                        ok(f_h === "" ? this.style.height === f_h : this.style.height.indexOf(f_h) === 0, "Height must be reset to " + f_h + ": " + this.style.height);
-                                       
+
                                var cur_o = jQuery.style(this, "opacity");
 
                                if ( t_o == "hide" || t_o == "show" )
                                        equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
-                                       
+
                                if ( t_w == "hide" )
                                        equals(this.style.display, "none", "Hiding, display should be none: " + this.style.display);
-                                       
+
                                if ( t_o.constructor == Number ) {
                                        equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o);
-                                       
+
                                        ok(jQuery.css(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o);
                                }
-                                       
+
                                if ( t_w.constructor == Number ) {
                                        equals(this.style.width, t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
-                                       
+
                                        var cur_w = jQuery.css(this,"width");
 
                                        ok(this.style.width != "" || cur_w == t_w, "Width should be explicitly set to " + t_w + ", is instead: " + cur_w);
                                }
-                                       
+
                                if ( t_h.constructor == Number ) {
                                        equals(this.style.height, t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
-                                       
+
                                        var cur_h = jQuery.css(this,"height");
 
                                        ok(this.style.height != "" || cur_h == t_h, "Height should be explicitly set to " + t_h + ", is instead: " + cur_w);
                                }
-                               
+
                                if ( t_h == "show" ) {
                                        var old_h = jQuery.css(this, "height");
                                        jQuery(this).append("<br/>Some more text<br/>and some more...");
@@ -519,23 +626,23 @@ jQuery.each( {
                                                equals(jQuery.css(this, "height"), old_h, "Make sure height is not auto.");
                                        }
                                }
-       
+
                                start();
                        });
                });
        });
 });
 
-jQuery.fn.saveState = function(){
-       var check = ['opacity','height','width','display','overflow'];  
+jQuery.fn.saveState = function(hiddenOverflow){
+       var check = ['opacity','height','width','display','overflow'];
        expect(check.length);
-       
+
        stop();
        return this.each(function(){
                var self = this;
                self.save = {};
                jQuery.each(check, function(i,c){
-                       self.save[c] = self.style[ c ] || jQuery.css(self,c);
+                       self.save[c] = c === "overflow" && hiddenOverflow ? "hidden" : self.style[ c ] || jQuery.css(self,c);
                });
        });
 };
@@ -558,39 +665,39 @@ test("Chain fadeIn fadeOut", function() {
 });
 
 test("Chain hide show", function() {
-       jQuery('#show div').saveState().hide('fast').show('fast',jQuery.checkState);
+       jQuery('#show div').saveState(jQuery.support.shrinkWrapBlocks).hide('fast').show('fast',jQuery.checkState);
 });
 test("Chain show hide", function() {
-       jQuery('#hide div').saveState().show('fast').hide('fast',jQuery.checkState);
+       jQuery('#hide div').saveState(jQuery.support.shrinkWrapBlocks).show('fast').hide('fast',jQuery.checkState);
 });
 test("Chain show hide with easing and callback", function() {
        jQuery('#hide div').saveState().show('fast').hide('fast','linear',jQuery.checkState);
 });
 
 test("Chain toggle in", function() {
-       jQuery('#togglein div').saveState().toggle('fast').toggle('fast',jQuery.checkState);
+       jQuery('#togglein div').saveState(jQuery.support.shrinkWrapBlocks).toggle('fast').toggle('fast',jQuery.checkState);
 });
 test("Chain toggle out", function() {
-       jQuery('#toggleout div').saveState().toggle('fast').toggle('fast',jQuery.checkState);
+       jQuery('#toggleout div').saveState(jQuery.support.shrinkWrapBlocks).toggle('fast').toggle('fast',jQuery.checkState);
 });
 test("Chain toggle out with easing and callback", function() {
- jQuery('#toggleout div').saveState().toggle('fast').toggle('fast','linear',jQuery.checkState);
+ jQuery('#toggleout div').saveState(jQuery.support.shrinkWrapBlocks).toggle('fast').toggle('fast','linear',jQuery.checkState);
 });
 test("Chain slideDown slideUp", function() {
-       jQuery('#slidedown div').saveState().slideDown('fast').slideUp('fast',jQuery.checkState);
+       jQuery('#slidedown div').saveState(jQuery.support.shrinkWrapBlocks).slideDown('fast').slideUp('fast',jQuery.checkState);
 });
 test("Chain slideUp slideDown", function() {
-       jQuery('#slideup div').saveState().slideUp('fast').slideDown('fast',jQuery.checkState);
+       jQuery('#slideup div').saveState(jQuery.support.shrinkWrapBlocks).slideUp('fast').slideDown('fast',jQuery.checkState);
 });
 test("Chain slideUp slideDown with easing and callback", function() {
-       jQuery('#slideup div').saveState().slideUp('fast').slideDown('fast','linear',jQuery.checkState);
+       jQuery('#slideup div').saveState(jQuery.support.shrinkWrapBlocks).slideUp('fast').slideDown('fast','linear',jQuery.checkState);
 });
 
 test("Chain slideToggle in", function() {
-       jQuery('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
+       jQuery('#slidetogglein div').saveState(jQuery.support.shrinkWrapBlocks).slideToggle('fast').slideToggle('fast',jQuery.checkState);
 });
 test("Chain slideToggle out", function() {
-       jQuery('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
+       jQuery('#slidetoggleout div').saveState(jQuery.support.shrinkWrapBlocks).slideToggle('fast').slideToggle('fast',jQuery.checkState);
 });
 
 test("Chain fadeTo 0.5 1.0 with easing and callback)", function() {
@@ -631,26 +738,26 @@ test("jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function ()
 });
 
 test("animate with per-property easing", function(){
-       
+
        expect(3);
        stop();
-       
+
        var _test1_called = false;
        var _test2_called = false;
        var _default_test_called = false;
-       
+
        jQuery.easing['_test1'] = function() {
                _test1_called = true;
        };
-       
+
        jQuery.easing['_test2'] = function() {
                _test2_called = true;
        };
-       
+
        jQuery.easing['_default_test'] = function() {
                _default_test_called = true;
        };
-       
+
        jQuery({a:0,b:0,c:0}).animate({
                a: [100, '_test1'],
                b: [100, '_test2'],
@@ -661,5 +768,5 @@ test("animate with per-property easing", function(){
                ok(_test2_called, "Easing function (2) called");
                ok(_default_test_called, "Easing function (_default) called");
        });
-       
+
 });
index 7b4f4d1..d4c4348 100644 (file)
@@ -680,7 +680,7 @@ test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-       expect(17);
+       expect(20);
        jQuery('#yahoo').replaceWith(val( '<b id="replace">buga</b>' ));
        ok( jQuery("#replace")[0], 'Replace element with string' );
        ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' );
@@ -748,6 +748,17 @@ var testReplaceWith = function(val) {
                //"</script>");
        equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');
        jQuery('.replacewith').remove();
+
+       QUnit.reset();
+
+       jQuery("#main").append("<div id='replaceWith'></div>");
+       equals( jQuery("#main").find("div[id=replaceWith]").length, 1, "Make sure only one div exists." );
+
+       jQuery("#replaceWith").replaceWith( val("<div id='replaceWith'></div>") );
+       equals( jQuery("#main").find("div[id=replaceWith]").length, 1, "Make sure only one div exists." );
+
+       jQuery("#replaceWith").replaceWith( val("<div id='replaceWith'></div>") );
+       equals( jQuery("#main").find("div[id=replaceWith]").length, 1, "Make sure only one div exists." );
 }
 
 test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -757,7 +768,7 @@ test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 test("replaceWith(Function)", function() {
        testReplaceWith(functionReturningObj);
 
-       expect(18);
+       expect(21);
 
        var y = jQuery("#yahoo")[0];