Add support for calling outer/inner Width/Height on the window and document. Fixes...

diff --git a/src/dimensions.js b/src/dimensions.js
index d54776536c109e67a896ca5e57f7a1dae13057ec..7df0d5ddfa4e8d4aa155328216d2241b861e0606 100644 (file)
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -8,16 +8,20 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
        // innerHeight and innerWidth
        jQuery.fn[ "inner" + name ] = function() {
                var elem = this[0];
-               return elem && elem.style ?
+               return elem ?
+                       elem.style ?
                        parseFloat( jQuery.css( elem, type, "padding" ) ) :
+                       this[ type ]() :
                        null;
        };
 
        // outerHeight and outerWidth
        jQuery.fn[ "outer" + name ] = function( margin ) {
                var elem = this[0];
-               return elem && elem.style ?
+               return elem ?
+                       elem.style ?
                        parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
+                       this[ type ]() :
                        null;
        };
 

diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 57229199af51bd6196a78e230282d7543187a8cf..7688168036b386a9bb548e91599b463b1a93c52c 100644 (file)
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -109,11 +109,14 @@ test("height() with function args", function() {
 test("innerWidth()", function() {
        expect(8);
 
-       equals(jQuery(window).innerWidth(), null, "Test on window without margin option");
-       equals(jQuery(window).innerWidth(true), null, "Test on window with margin option");
+       var winWidth = jQuery( window ).width(),
+               docWidth = jQuery( document ).width();
 
-       equals(jQuery(document).innerWidth(), null, "Test on document without margin option");
-       equals(jQuery(document).innerWidth(true), null, "Test on document with margin option");
+       equals(jQuery(window).innerWidth(), winWidth, "Test on window without margin option");
+       equals(jQuery(window).innerWidth(true), winWidth, "Test on window with margin option");
+
+       equals(jQuery(document).innerWidth(), docWidth, "Test on document without margin option");
+       equals(jQuery(document).innerWidth(true), docWidth, "Test on document with margin option");
 
        var $div = jQuery("#nothiddendiv");
        // set styles
@@ -144,11 +147,14 @@ test("innerWidth()", function() {
 test("innerHeight()", function() {
        expect(8);
 
-       equals(jQuery(window).innerHeight(), null, "Test on window without margin option");
-       equals(jQuery(window).innerHeight(true), null, "Test on window with margin option");
+       var winHeight = jQuery( window ).height(),
+               docHeight = jQuery( document ).height();
+
+       equals(jQuery(window).innerHeight(), winHeight, "Test on window without margin option");
+       equals(jQuery(window).innerHeight(true), winHeight, "Test on window with margin option");
 
-       equals(jQuery(document).innerHeight(), null, "Test on document without margin option");
-       equals(jQuery(document).innerHeight(true), null, "Test on document with margin option");
+       equals(jQuery(document).innerHeight(), docHeight, "Test on document without margin option");
+       equals(jQuery(document).innerHeight(true), docHeight, "Test on document with margin option");
 
        var $div = jQuery("#nothiddendiv");
        // set styles
@@ -179,10 +185,13 @@ test("innerHeight()", function() {
 test("outerWidth()", function() {
        expect(11);
 
-       equal( jQuery( window ).outerWidth(), null, "Test on window without margin option" );
-       equal( jQuery( window ).outerWidth( true ), null, "Test on window with margin option" );
-       equal( jQuery( document ).outerWidth(), null, "Test on document without margin option" );
-       equal( jQuery( document ).outerWidth( true ), null, "Test on document with margin option" );
+       var winWidth = jQuery( window ).width(),
+               docWidth = jQuery( document ).width();
+
+       equal( jQuery( window ).outerWidth(), winWidth, "Test on window without margin option" );
+       equal( jQuery( window ).outerWidth( true ), winWidth, "Test on window with margin option" );
+       equal( jQuery( document ).outerWidth(), docWidth, "Test on document without margin option" );
+       equal( jQuery( document ).outerWidth( true ), docWidth, "Test on document with margin option" );
 
        var $div = jQuery("#nothiddendiv");
        $div.css("width", 30);
@@ -239,10 +248,14 @@ test("child of a hidden elem has accurate inner/outer/Width()/Height()  see #944
 test("outerHeight()", function() {
        expect(11);
 
-       equal( jQuery( window ).outerHeight(), null, "Test on window without margin option" );
-       equal( jQuery( window ).outerHeight( true ), null, "Test on window with margin option" );
-       equal( jQuery( document ).outerHeight(), null, "Test on document without margin option" );
-       equal( jQuery( document ).outerHeight( true ), null, "Test on document with margin option" );
+       var winHeight = jQuery( window ).height(),
+               docHeight = jQuery( document ).height();
+
+
+       equal( jQuery( window ).outerHeight(), winHeight, "Test on window without margin option" );
+       equal( jQuery( window ).outerHeight( true ), winHeight, "Test on window with margin option" );
+       equal( jQuery( document ).outerHeight(), docHeight, "Test on document without margin option" );
+       equal( jQuery( document ).outerHeight( true ), docHeight, "Test on document with margin option" );
 
        var $div = jQuery("#nothiddendiv");
        $div.css("height", 30);