Skip to content

Ticket 5645 - Position: Allow for arbitrary element to be containing element #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jzaefferer merged 20 commits into from
Jun 9, 2011
+748 −62
Merged

Ticket 5645 - Position: Allow for arbitrary element to be containing element #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c6afaa1
Fix #5645 - Position: Allow for arbitrary element to be containing el…
May 11, 2011
abf3a86
Fix issue when window is "within".
May 11, 2011
9e4e359
fix spacing and add in a missing comma
May 11, 2011
b649799
Replace comma with semi-colon. How'd that get there?
May 12, 2011
396ed55
Add a new visual test for position
May 12, 2011
0bda22f
Update title to reflect test
May 12, 2011
7bca8c1
Fix typos in original tests
May 12, 2011
17be87f
Whitespace fix
May 12, 2011
dc66f02
Add tests for position's `within`
May 12, 2011
c9c6908
Another whitespace fix
May 12, 2011
e31d707
The qunit-fixture were preventing the results from being clicked. Mak…
May 12, 2011
2f4da6f
Update var name to avoid confusion
May 13, 2011
2bf45db
Update test to make things a bit easier to test
May 13, 2011
939b698
Update position to work properly when window and/or within element is…
May 13, 2011
cf96d22
position now passes all tests! 0/
May 13, 2011
f798b04
Update core visual test to allow testing while the window is scrolled.
May 13, 2011
e4a4299
Removing unnecessary variables, caching 'within' in tests where its b…
May 16, 2011
c11ac9c
Now takes scrollbar width into account in collision detection
May 26, 2011
cde7cc0
updated tests to account for scrollbar width/height
May 26, 2011
40c0088
Fix visual test in IE6 and move the new helper functions for getting …
May 26, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 34 additions & 27 deletions tests/unit/position/position.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,47 +16,54 @@
<script src="../testsuite.js"></script>

<script src="position_core.js"></script>
<script src="position_core_within.js"></script>

<script src="../swarminject.js"></script>
</head>
<body>

<h1 id="qunit-header">jQuery UI Position Test Suite</h1>
<h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests">
</ol>
<div style="position:relative; z-index:2;">
<h1 id="qunit-header">jQuery UI Position Test Suite</h1>
<h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests">
</ol>
</div>

<!--
elements smaller than 10px have a line-height set on them to avoid a bug in IE6
.height() returns the greater of the height and line-height
-->

<div id="qunit-fixture" style="top: 0; left: 0;">
<div id="el1" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
<div id="el2" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>
</div>

<div style="position: absolute; top: 0px; left: 0px">
<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
<div id="qunit-fixture" style="top: 0; left: 0; z-index:1">
<div id="within-container">
<div id="el1" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
<div id="el2" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>

<div style="position: absolute; top: 0px; left: 0px">
<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
</div>

<div style="position: absolute; top: 200px; left: 100px;">
<div id="el-offset-100-200" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
<div style="position: absolute; top: 100px; left: 50px;">
<div id="el-two-offset-150-300" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
<div id="el-fixed" style="position: fixed; top: 200px; left: 200px;"></div>
</div>
</div>

<div style="position: absolute; height: 5000px; width: 5000px;"></div>

<div id="bug-5280" style="height: 30px; width: 201px;">
<div style="width: 50px; height: 10px;"></div>
</div>
</div>
</div>

<div style="position: absolute; top: 200px; left: 100px;">
<div id="el-offset-100-200" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
<div style="position: absolute; top: 100px; left: 50px;">
<div id="el-two-offset-150-300" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
<div id="el-fixed" style="position: fixed; top: 200px; left: 200px;"></div>
</div>
</div>

<div style="position: absolute; height: 5000px; width: 5000px;"></div>

<div id="bug-5280" style="height: 30px; width: 201px;">
<div style="width: 50px; height: 10px;"></div>
</div>

</body>
</html>
5 changes: 3 additions & 2 deletions tests/unit/position/position_core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ test( "positions", function() {
center: 3,
right: 6,
top: 0,
center: 3,
bottom: 6
};
var start = { left: 4, top: 4 };
Expand Down Expand Up @@ -316,6 +315,7 @@ test( "collision: fit, window scrolled", function() {
if ( scrollTopSupport() ) {
var win = $( window );
win.scrollTop( 300 ).scrollLeft( 200 );

collisionTest({
collision: "fit",
at: "left-100 top-100"
Expand All @@ -324,6 +324,7 @@ test( "collision: fit, window scrolled", function() {
collision: "fit",
at: "right+100 bottom+100"
}, { top: 300 + win.height() - 10, left: 200 + win.width() - 10 }, "right bottom" );

win.scrollTop( 0 ).scrollLeft( 0 );
}
});
Expand Down Expand Up @@ -351,7 +352,7 @@ test( "collision: flip, with offset", function() {

collisionTest2({
collision: "flip",
at: "left-2 top-3",
at: "left-2 top-3"
}, { top: $( window ).height() + 3, left: $( window ).width() + 2 }, "right bottom, negative offset" );
});

Expand Down
Loading