Changeset 3959

Timestamp:

11/28/07 01:01:49 (11 months ago)

Author:

davidserduke

Message:

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.

Location:

trunk/jquery

Files:

• src/core.js (modified) (4 diffs)
• test/index.html (modified) (1 diff)
• test/unit/core.js (modified) (1 diff)

trunk/jquery/src/core.js

@@ -44 +44 @@
 
         // 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 );
@@ -195 +195 @@
 
     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" );
     },
@@ -361 +364 @@
             if ( this.length ) {
                 var elem = this[0];
-                
+
                 // We need to handle select boxes special
                 if ( jQuery.nodeName( elem, "select" ) ) {
@@ -1322 +1325 @@
                 // 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 ?

trunk/jquery/test/index.html

@@ -21 +21 @@
     
     <!-- Test HTML -->
+    <div id="nothiddendiv" style="height:1px;background:white;"></div>
     <dl id="dl" style="display:none;">
     <div id="main" style="display: none;">

trunk/jquery/test/unit/core.js

@@ -409 +409 @@
     ok( !! $(":checkbox:first", $checkedtest).attr("checked"), "Check first checkbox still checked." );
     ok( ! $(":checkbox:last", $checkedtest).attr("checked"), "Check last checkbox still NOT checked." );
+});
+
+test("width()", function() {
+    expect(2);
+
+    $("#nothiddendiv").width(30);
+    equals($("#nothiddendiv").width(), 30, "Test set to 30 correctly");
+    $("#nothiddendiv").width(-1); // handle negative numbers by ignoring #1599
+    equals($("#nothiddendiv").width(), 30, "Test negative width ignored");
 });