library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Dimensions: Empty sets should return undefined"

Browse Source 
This reverts commit 97d79ecf6b.
This commit is contained in:
Oleg Gaidarenko 2015-11-11 18:48:50 +03:00
parent 88046440da
commit ebbfb1bc5c
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dimensions.js
View File

@ -45,7 +45,7 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
// Set width or height on the element
jQuery.style( elem, type, value, extra );
}, type, chainable ? margin : undefined, chainable );
}, type, chainable ? margin : undefined, chainable, null );
};
} );
} );

38
test/unit/dimensions.js
View File

@ -30,7 +30,7 @@ function fn( val ) {
function testWidth( val, assert ) {
assert.expect( 9 );
var $div, $empty;
var $div, blah;
$div = jQuery( "#nothiddendiv" );
$div.width( val( 30 ) );
@ -51,9 +51,9 @@ function testWidth( val, assert ) {
assert.equal( jQuery( "#nothiddendivchild" ).width(), 20, "Test child width with border and padding" );
jQuery( "#nothiddendiv, #nothiddendivchild" ).css( { "border": "", "padding": "", "width": "" } );
$empty = jQuery();
assert.equal( $empty.width( val( 10 ) ), $empty, "Make sure that setting a width on an empty set returns the set." );
assert.strictEqual( $empty.width(), undefined, "Make sure 'undefined' is returned on an empty set" );
blah = jQuery( "blah" );
assert.equal( blah.width( val( 10 ) ), blah, "Make sure that setting a width on an empty set returns the set." );
assert.equal( blah.width(), null, "Make sure 'null' is returned on an empty set" );
assert.equal( jQuery( window ).width(), document.documentElement.clientWidth, "Window width is equal to width reported by window/document." );
}
@ -104,7 +104,7 @@ function testHeight( val, assert ) {
blah = jQuery( "blah" );
assert.equal( blah.height( val( 10 ) ), blah, "Make sure that setting a height on an empty set returns the set." );
assert.strictEqual( blah.height(), undefined, "Make sure 'undefined' is returned on an empty set" );
assert.equal( blah.height(), null, "Make sure 'null' is returned on an empty set" );
assert.equal( jQuery( window ).height(), document.documentElement.clientHeight, "Window width is equal to width reported by window/document." );
}
@ -130,7 +130,7 @@ QUnit.test( "height(Function(args))", function( assert ) {
} );
QUnit.test( "innerWidth()", function( assert ) {
assert.expect( 7 );
assert.expect( 6 );
var $div, div,
$win = jQuery( window ),
@ -138,7 +138,6 @@ QUnit.test( "innerWidth()", function( assert ) {
assert.equal( jQuery( window ).innerWidth(), $win.width(), "Test on window" );
assert.equal( jQuery( document ).innerWidth(), $doc.width(), "Test on document" );
assert.strictEqual( jQuery().innerWidth(), undefined, "Test on empty set" );
$div = jQuery( "#nothiddendiv" );
$div.css( {
@ -165,7 +164,7 @@ QUnit.test( "innerWidth()", function( assert ) {
} );
QUnit.test( "innerHeight()", function( assert ) {
assert.expect( 7 );
assert.expect( 6 );
var $div, div,
$win = jQuery( window ),
@ -173,7 +172,6 @@ QUnit.test( "innerHeight()", function( assert ) {
assert.equal( jQuery( window ).innerHeight(), $win.height(), "Test on window" );
assert.equal( jQuery( document ).innerHeight(), $doc.height(), "Test on document" );
assert.strictEqual( jQuery().innerHeight(), undefined, "Test on empty set" );
$div = jQuery( "#nothiddendiv" );
$div.css( {
@ -200,7 +198,7 @@ QUnit.test( "innerHeight()", function( assert ) {
} );
QUnit.test( "outerWidth()", function( assert ) {
assert.expect( 12 );
assert.expect( 11 );
var $div, div,
$win = jQuery( window ),
@ -211,7 +209,6 @@ QUnit.test( "outerWidth()", function( assert ) {
assert.equal( jQuery( window ).outerWidth( true ), winwidth, "Test on window with margin option" );
assert.equal( jQuery( document ).outerWidth(), $doc.width(), "Test on document without margin option" );
assert.equal( jQuery( document ).outerWidth( true ), $doc.width(), "Test on document with margin option" );
assert.strictEqual( jQuery().outerWidth(), undefined, "Test on empty set" );
$div = jQuery( "#nothiddendiv" );
$div.css( "width", 30 );
@ -240,7 +237,7 @@ QUnit.test( "outerWidth()", function( assert ) {
} );
QUnit.test( "outerHeight()", function( assert ) {
assert.expect( 12 );
assert.expect( 11 );
var $div, div,
$win = jQuery( window ),
@ -251,7 +248,6 @@ QUnit.test( "outerHeight()", function( assert ) {
assert.equal( jQuery( window ).outerHeight( true ), winheight, "Test on window with margin option" );
assert.equal( jQuery( document ).outerHeight(), $doc.height(), "Test on document without margin option" );
assert.equal( jQuery( document ).outerHeight( true ), $doc.height(), "Test on document with margin option" );
assert.strictEqual( jQuery().outerHeight(), undefined, "Test on empty set" );
$div = jQuery( "#nothiddendiv" );
$div.css( "height", 30 );
@ -405,6 +401,22 @@ QUnit.test( "passing undefined is a setter #5571", function( assert ) {
assert.equal( jQuery( "#nothiddendiv" ).width( 30 ).width( undefined ).width(), 30, ".width(undefined) is chainable (#5571)" );
} );
QUnit.test( "getters on non elements should return null", function( assert ) {
assert.expect( 8 );
var nonElem = jQuery( "notAnElement" );
assert.strictEqual( nonElem.width(), null, ".width() is not null (#12283)" );
assert.strictEqual( nonElem.innerWidth(), null, ".innerWidth() is not null (#12283)" );
assert.strictEqual( nonElem.outerWidth(), null, ".outerWidth() is not null (#12283)" );
assert.strictEqual( nonElem.outerWidth( true ), null, ".outerWidth(true) is not null (#12283)" );
assert.strictEqual( nonElem.height(), null, ".height() is not null (#12283)" );
assert.strictEqual( nonElem.innerHeight(), null, ".innerHeight() is not null (#12283)" );
assert.strictEqual( nonElem.outerHeight(), null, ".outerHeight() is not null (#12283)" );
assert.strictEqual( nonElem.outerHeight( true ), null, ".outerHeight(true) is not null (#12283)" );
} );
QUnit.test( "setters with and without box-sizing:border-box", function( assert ) {
assert.expect( 60 );