diff options
Diffstat (limited to 'src/dimensions.js')
-rw-r--r-- | src/dimensions.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dimensions.js b/src/dimensions.js index f052b5505..42e3f1d63 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -3,23 +3,23 @@ jQuery.each([ "Height", "Width" ], function(i, name){ var tl = name == "Height" ? "Top" : "Left", // top or left br = name == "Height" ? "Bottom" : "Right"; // bottom or right - + // innerHeight and innerWidth jQuery.fn["inner" + name] = function(){ - return this[ name.toLowerCase() ]() + - num(this, "padding" + tl) + + return this[ name.toLowerCase() ]() + + num(this, "padding" + tl) + num(this, "padding" + br); }; - + // outerHeight and outerWidth jQuery.fn["outer" + name] = function(margin) { - return this["inner" + name]() + + 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); }; - + }); function num(elem, prop) { |