git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8f14ee1
)
Made outerHeight/outerWidth accept .outerWidth(true) to include the margin. If any...
author
John Resig
<jeresig@gmail.com>
Sat, 15 Mar 2008 19:00:07 +0000
(19:00 +0000)
committer
John Resig
<jeresig@gmail.com>
Sat, 15 Mar 2008 19:00:07 +0000
(19:00 +0000)
src/offset.js
patch
|
blob
|
history
diff --git
a/src/offset.js
b/src/offset.js
index
4cd58cf
..
010c57d
100644
(file)
--- a/
src/offset.js
+++ b/
src/offset.js
@@
-111,15
+111,12
@@
jQuery.each(["Height", "Width"], function(i, name){
};
// outerHeight and outerWidth
};
// 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") +
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);
};
});
};
});