aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Serduke <davidserduke@gmail.com>2007-11-28 01:01:49 +0000
committerDavid Serduke <davidserduke@gmail.com>2007-11-28 01:01:49 +0000
commit0a755f6ab38d36ffda02f9ff5a6d606c24a94baa (patch)
treeade0201e0ae397e2fab4d530ac3eda20ff202c60 /src
parent2ccd2cb36be6169afee3bd6e82ba3539f432c73f (diff)
downloadjquery-0a755f6ab38d36ffda02f9ff5a6d606c24a94baa.tar.gz
jquery-0a755f6ab38d36ffda02f9ff5a6d606c24a94baa.zip
Fixed #1599 as Brandon suggested to ignore negative values to width and height css. The fix itself is slightly different as it was moved to .css() instead of staying in .attr() like in his patch. I decided there was less chance of incorrect behavior (like if someone had an XML file with a width attribute that could be negative). Also took out some unneeded white space while I was in there.
Diffstat (limited to 'src')
-rw-r--r--src/core.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core.js b/src/core.js
index b701abea9..ce2651963 100644
--- a/src/core.js
+++ b/src/core.js
@@ -43,7 +43,7 @@ jQuery.fn = jQuery.prototype = {
return this;
// Handle HTML strings
- } else if ( typeof selector == "string" ) {
+ } else if ( typeof selector == "string" ) {
// Are we dealing with HTML string or an ID?
var match = quickExpr.exec( selector );
@@ -194,6 +194,9 @@ jQuery.fn = jQuery.prototype = {
},
css: function( key, value ) {
+ // ignore negative width and height values
+ if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
+ value = undefined;
return this.attr( key, value, "curCSS" );
},
@@ -360,7 +363,7 @@ jQuery.fn = jQuery.prototype = {
if ( this.length ) {
var elem = this[0];
-
+
// We need to handle select boxes special
if ( jQuery.nodeName( elem, "select" ) ) {
var index = elem.selectedIndex,
@@ -1321,7 +1324,7 @@ jQuery.each([ "Height", "Width" ], function(i, name){
this[0] == document ?
// Either scroll[Width/Height] or offset[Width/Height], whichever is greater (Mozilla reports scrollWidth the same as offsetWidth)
Math.max( document.body[ "scroll" + name ], document.body[ "offset" + name ] ) :
-
+
// Get or set width or height on the element
size == undefined ?
// Get width or height on the element