Changeset 3824

Timestamp:

11/14/07 20:20:00 (9 months ago)

Author:

brandon.aaron

Message:

Dimensions: use clientWidth/Height and offsetWidth/Height in inner/outerWidth/Height methods if element is visible.

Files:

• trunk/plugins/dimensions/jquery.dimensions.js (modified) (2 diffs)

trunk/plugins/dimensions/jquery.dimensions.js

@@ -27 +27 @@
             borr = name == 'Height' ? 'Bottom' : 'Right'; // bottom or right
         
-        return num( this, name.toLowerCase() ) + num(this, 'padding' + torl) + num(this, 'padding' + borr);
+        return this.is(':visible') ? this[0]['client' + name] : num( this, name.toLowerCase() ) + num(this, 'padding' + torl) + num(this, 'padding' + borr);
     };
     
@@ -39 +39 @@
         options = $.extend({ margin: false }, options || {});
         
-        return num( this, name.toLowerCase() )
-                + num(this, 'border' + torl + 'Width') + num(this, 'border' + borr + 'Width')
-                + num(this, 'padding' + torl) + num(this, 'padding' + borr)
-                + (options.margin ? (num(this, 'margin' + torl) + num(this, 'margin' + borr)) : 0);
+        var val = this.is(':visible') ? 
+                this[0]['offset' + name] : 
+                num( this, name.toLowerCase() )
+                    + num(this, 'border' + torl + 'Width') + num(this, 'border' + borr + 'Width')
+                    + num(this, 'padding' + torl) + num(this, 'padding' + borr);
+        
+        return val + (options.margin ? (num(this, 'margin' + torl) + num(this, 'margin' + borr)) : 0);
     };
 });