git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jquery fx: closes #3495. Animations are synchronous when duration is 0.
[jquery.git]
/
src
/
dimensions.js
diff --git
a/src/dimensions.js
b/src/dimensions.js
index
42e3f1d
..
bcef47f
100644
(file)
--- a/
src/dimensions.js
+++ b/
src/dimensions.js
@@
-1,8
+1,8
@@
// Create innerHeight, innerWidth, outerHeight and outerWidth methods
jQuery.each([ "Height", "Width" ], function(i, name){
// Create innerHeight, innerWidth, outerHeight and outerWidth methods
jQuery.each([ "Height", "Width" ], function(i, name){
- var tl = name == "Height" ? "Top" : "Left", // top or left
- br = name == "Height" ? "Bottom" : "Right"; // bottom or right
+ var tl = i ? "Left" : "Top", // top or left
+ br = i ? "Right" : "Bottom"; // bottom or right
// innerHeight and innerWidth
jQuery.fn["inner" + name] = function(){
// innerHeight and innerWidth
jQuery.fn["inner" + name] = function(){
@@
-16,13
+16,8
@@
jQuery.each([ "Height", "Width" ], function(i, name){
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") +
- (!!margin ?
+ (margin ?
num(this, "margin" + tl) + num(this, "margin" + br) : 0);
};
num(this, "margin" + tl) + num(this, "margin" + br) : 0);
};
-});
-
-function num(elem, prop) {
- elem = elem.jquery ? elem[0] : elem;
- return elem && parseInt( jQuery.curCSS(elem, prop, true), 10 ) || 0;
-}
+});
\ No newline at end of file