Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merged dimensions with core
- Loading branch information
1 parent
f3f3238
commit aea452f1624df811c8b0b2916bfb22213d153f9d
Showing
6 changed files
with
178 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,28 @@ | ||
// 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 | ||
|
||
// innerHeight and innerWidth | ||
jQuery.fn["inner" + name] = function(){ | ||
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]() + | ||
num(this, "border" + tl + "Width") + | ||
num(this, "border" + br + "Width") + | ||
(!!margin ? | ||
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) ) || 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,85 @@ | ||
module("dimensions"); | ||
|
||
test("innerWidth()", function() { | ||
expect(3); | ||
|
||
var $div = $("#nothiddendiv"); | ||
// set styles | ||
$div.css({ | ||
margin: 10, | ||
border: "2px solid #fff", | ||
width: 30 | ||
}); | ||
|
||
equals($div.innerWidth(), 30, "Test with margin and border"); | ||
$div.css("padding", "20px"); | ||
equals($div.innerWidth(), 70, "Test with margin, border and padding"); | ||
$div.hide(); | ||
equals($div.innerWidth(), 70, "Test hidden div"); | ||
|
||
// reset styles | ||
$div.css({ display: "", border: "", padding: "", width: "", height: "" }); | ||
}); | ||
|
||
test("innerHeight()", function() { | ||
expect(3); | ||
|
||
var $div = $("#nothiddendiv"); | ||
// set styles | ||
$div.css({ | ||
margin: 10, | ||
border: "2px solid #fff", | ||
height: 30 | ||
}); | ||
|
||
equals($div.innerHeight(), 30, "Test with margin and border"); | ||
$div.css("padding", "20px"); | ||
equals($div.innerHeight(), 70, "Test with margin, border and padding"); | ||
$div.hide(); | ||
equals($div.innerHeight(), 70, "Test hidden div"); | ||
|
||
// reset styles | ||
$div.css({ display: "", border: "", padding: "", width: "", height: "" }); | ||
}); | ||
|
||
test("outerWidth()", function() { | ||
expect(6); | ||
|
||
var $div = $("#nothiddendiv"); | ||
$div.css("width", 30); | ||
|
||
equals($div.outerWidth(), 30, "Test with only width set"); | ||
$div.css("padding", "20px"); | ||
equals($div.outerWidth(), 70, "Test with padding"); | ||
$div.css("border", "2px solid #fff"); | ||
equals($div.outerWidth(), 74, "Test with padding and border"); | ||
$div.css("margin", "10px"); | ||
equals($div.outerWidth(), 74, "Test with padding, border and margin without margin option"); | ||
equals($div.outerWidth(true), 94, "Test with padding, border and margin with margin option"); | ||
$div.hide(); | ||
equals($div.outerWidth(true), 94, "Test hidden div with padding, border and margin with margin option"); | ||
|
||
// reset styles | ||
$div.css({ display: "", border: "", padding: "", width: "", height: "" }); | ||
}); | ||
|
||
test("outerHeight()", function() { | ||
expect(6); | ||
|
||
var $div = $("#nothiddendiv"); | ||
$div.css("height", 30); | ||
|
||
equals($div.outerHeight(), 30, "Test with only width set"); | ||
$div.css("padding", "20px"); | ||
equals($div.outerHeight(), 70, "Test with padding"); | ||
$div.css("border", "2px solid #fff"); | ||
equals($div.outerHeight(), 74, "Test with padding and border"); | ||
$div.css("margin", "10px"); | ||
equals($div.outerHeight(), 74, "Test with padding, border and margin without margin option"); | ||
equals($div.outerHeight(true), 94, "Test with padding, border and margin with margin option"); | ||
$div.hide(); | ||
equals($div.outerHeight(true), 94, "Test hidden div with padding, border and margin with margin option"); | ||
|
||
// reset styles | ||
$div.css({ display: "", border: "", padding: "", width: "", height: "" }); | ||
}); |