diff options
| author | John Resig <jeresig@gmail.com> | 2008-03-15 19:00:07 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2008-03-15 19:00:07 +0000 |
| commit | d44ddef720684d1eccba8cfe7d1afbaac5327378 (patch) | |
| tree | d83e0973cdeea1b7d9c00401dcbdc0212277bc83 /src/offset.js | |
| parent | 8f14ee1dd5c3bffc987f9a21a518f9901de66b54 (diff) | |
| download | jquery-d44ddef720684d1eccba8cfe7d1afbaac5327378.tar.gz jquery-d44ddef720684d1eccba8cfe7d1afbaac5327378.zip | |
Made outerHeight/outerWidth accept .outerWidth(true) to include the margin. If any options are passed in it's assumed that you want the margin included.
Diffstat (limited to 'src/offset.js')
| -rw-r--r-- | src/offset.js | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/offset.js b/src/offset.js index 4cd58cf7f..010c57d19 100644 --- a/src/offset.js +++ b/src/offset.js @@ -111,15 +111,12 @@ jQuery.each(["Height", "Width"], function(i, name){ }; // outerHeight and outerWidth - jQuery.fn["outer" + name] = function(options) { - options = jQuery.extend({ margin: false }, options); - + jQuery.fn["outer" + name] = function(margin) { return this["inner" + name]() + num(this, "border" + tl + "Width") + num(this, "border" + br + "Width") + - (options.margin ? - num(this, "margin" + tl) + num(this, "margin" + br) : - 0); + (!!margin ? + num(this, "margin" + tl) + num(this, "margin" + br) : 0); }; }); |