Permalink
Browse files

Fix #12283. Return null for dimension getters on non elements. Fix gh…

  • Loading branch information...
1 parent 9f86dc9 commit ad040181dc6c05fa37941a6c9bfbe98bdf7ba8f1 @mikesherov mikesherov committed with dmethvin Aug 19, 2012
Showing with 17 additions and 1 deletion.
  1. +1 −1 src/dimensions.js
  2. +16 −0 test/unit/dimensions.js
View
@@ -35,7 +35,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 );
};
});
});
View
@@ -385,6 +385,22 @@ test("passing undefined is a setter #5571", function() {
equal(jQuery("#nothiddendiv").width(30).width(undefined).width(), 30, ".width(undefined) is chainable (#5571)");
});
+test( "getters on non elements should return null", function() {
+ expect( 8 );
+
+ var nonElem = jQuery("notAnElement");
+
+ strictEqual( nonElem.width(), null, ".width() is not null (#12283)" );
+ strictEqual( nonElem.innerWidth(), null, ".innerWidth() is not null (#12283)" );
+ strictEqual( nonElem.outerWidth(), null, ".outerWidth() is not null (#12283)" );
+ strictEqual( nonElem.outerWidth( true ), null, ".outerWidth(true) is not null (#12283)" );
+
+ strictEqual( nonElem.height(), null, ".height() is not null (#12283)" );
+ strictEqual( nonElem.innerHeight(), null, ".innerHeight() is not null (#12283)" );
+ strictEqual( nonElem.outerHeight(), null, ".outerHeight() is not null (#12283)" );
+ strictEqual( nonElem.outerHeight( true ), null, ".outerHeight(true) is not null (#12283)" );
+});
+
test("setters with and without box-sizing:border-box", function(){
expect(20);

0 comments on commit ad04018

Please sign in to comment.