Clean trailing whitespace from all files.

[jquery.git] / test / unit / dimensions.js

diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 5397790..b38e73b 100644 (file)
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -9,7 +9,7 @@ function fn( val ) {
 }
 
 function testWidth( val ) {
-       expect(7);
+       expect(8);
 
        var $div = jQuery("#nothiddendiv");
        $div.width( val(30) );
@@ -32,6 +32,7 @@ function testWidth( val ) {
 
        var blah = jQuery("blah");
        equals( blah.width( val(10) ), blah, "Make sure that setting a width on an empty set returns the set." );
+       equals( blah.width(), null, "Make sure 'null' is returned on an empty set");
 }
 
 test("width()", function() {
@@ -44,18 +45,18 @@ test("width() with function", function() {
 
 test("width() with function args", function() {
        expect( 2 );
-       
+
        var $div = jQuery("#nothiddendiv");
        $div.width( 30 ).width(function(i, width) {
                equals( width, 30, "Make sure previous value is corrrect." );
                return width + 1;
        });
-       
+
        equals( $div.width(), 31, "Make sure value was modified correctly." );
 });
 
 function testHeight( val ) {
-       expect(6);
+       expect(8);
 
        var $div = jQuery("#nothiddendiv");
        $div.height( val(30) );
@@ -72,32 +73,37 @@ function testHeight( val ) {
 
        $div.css({ display: "", border: "", padding: "", height: "1px" });
 
+       jQuery("#nothiddendivchild").css({ height: 20, padding: "3px", border: "2px solid #fff" });
+       equals(jQuery("#nothiddendivchild").height(), 20, "Test child height with border and padding");
+       jQuery("#nothiddendiv, #nothiddendivchild").css({ border: "", padding: "", height: "" });
+
        var blah = jQuery("blah");
        equals( blah.height( val(10) ), blah, "Make sure that setting a height on an empty set returns the set." );
+       equals( blah.height(), null, "Make sure 'null' is returned on an empty set");
 }
 
 test("height()", function() {
        testHeight( pass );
 });
 
-test("width() with function", function() {
+test("height() with function", function() {
        testHeight( fn );
 });
 
 test("height() with function args", function() {
        expect( 2 );
-       
+
        var $div = jQuery("#nothiddendiv");
        $div.height( 30 ).height(function(i, height) {
                equals( height, 30, "Make sure previous value is corrrect." );
                return height + 1;
        });
-       
+
        equals( $div.height(), 31, "Make sure value was modified correctly." );
 });
 
 test("innerWidth()", function() {
-       expect(3);
+       expect(4);
 
        var $div = jQuery("#nothiddendiv");
        // set styles
@@ -106,20 +112,25 @@ test("innerWidth()", function() {
                border: "2px solid #fff",
                width: 30
        });
-       
+
        equals($div.innerWidth(), 30, "Test with margin and border");
        $div.css("padding", "20px");
        equals($div.innerWidth(), 70, "Test with margin, border and padding");
        $div.hide();
        equals($div.innerWidth(), 70, "Test hidden div");
-       
+
        // reset styles
        $div.css({ display: "", border: "", padding: "", width: "", height: "" });
+
+       var div = jQuery( "<div>" );
+
+       // Temporarily require 0 for backwards compat - should be auto
+       equals( div.innerWidth(), 0, "Make sure that disconnected nodes are handled." );
 });
 
 test("innerHeight()", function() {
-       expect(3);
-       
+       expect(4);
+
        var $div = jQuery("#nothiddendiv");
        // set styles
        $div.css({
@@ -127,23 +138,28 @@ test("innerHeight()", function() {
                border: "2px solid #fff",
                height: 30
        });
-       
+
        equals($div.innerHeight(), 30, "Test with margin and border");
        $div.css("padding", "20px");
        equals($div.innerHeight(), 70, "Test with margin, border and padding");
        $div.hide();
        equals($div.innerHeight(), 70, "Test hidden div");
-       
+
        // reset styles
        $div.css({ display: "", border: "", padding: "", width: "", height: "" });
+
+       var div = jQuery( "<div>" );
+
+       // Temporarily require 0 for backwards compat - should be auto
+       equals( div.innerHeight(), 0, "Make sure that disconnected nodes are handled." );
 });
 
 test("outerWidth()", function() {
-       expect(6);
-       
+       expect(7);
+
        var $div = jQuery("#nothiddendiv");
        $div.css("width", 30);
-       
+
        equals($div.outerWidth(), 30, "Test with only width set");
        $div.css("padding", "20px");
        equals($div.outerWidth(), 70, "Test with padding");
@@ -155,17 +171,22 @@ test("outerWidth()", function() {
        equals($div.outerWidth(true), 94, "Test with padding, border and margin with margin option");
        $div.hide();
        equals($div.outerWidth(true), 94, "Test hidden div with padding, border and margin with margin option");
-       
+
        // reset styles
        $div.css({ position: "", display: "", border: "", padding: "", width: "", height: "" });
+
+       var div = jQuery( "<div>" );
+
+       // Temporarily require 0 for backwards compat - should be auto
+       equals( div.outerWidth(), 0, "Make sure that disconnected nodes are handled." );
 });
 
 test("outerHeight()", function() {
-       expect(6);
-       
+       expect(7);
+
        var $div = jQuery("#nothiddendiv");
        $div.css("height", 30);
-       
+
        equals($div.outerHeight(), 30, "Test with only width set");
        $div.css("padding", "20px");
        equals($div.outerHeight(), 70, "Test with padding");
@@ -176,7 +197,12 @@ test("outerHeight()", function() {
        equals($div.outerHeight(true), 94, "Test with padding, border and margin with margin option");
        $div.hide();
        equals($div.outerHeight(true), 94, "Test hidden div with padding, border and margin with margin option");
-       
+
        // reset styles
        $div.css({ display: "", border: "", padding: "", width: "", height: "" });
+
+       var div = jQuery( "<div>" );
+
+       // Temporarily require 0 for backwards compat - should be auto
+       equals( div.outerHeight(), 0, "Make sure that disconnected nodes are handled." );
 });