diff options
author | kborchers <kris.borchers@gmail.com> | 2011-08-12 22:19:52 -0500 |
---|---|---|
committer | kborchers <kris.borchers@gmail.com> | 2011-08-12 22:19:52 -0500 |
commit | 80bbebd4893ca0d75d556553a74550d01f52892f (patch) | |
tree | dabf8003668671617441d275d7f15200fed9042a /tests/unit/position/position.html | |
parent | ac04462d22d30f4b1a5e0dd34d57fbcc0450b48d (diff) | |
download | jquery-ui-80bbebd4893ca0d75d556553a74550d01f52892f.tar.gz jquery-ui-80bbebd4893ca0d75d556553a74550d01f52892f.zip |
Position: Added better collision detection for flip and fit, added visual tests for each and updated the unit tests to take the changes into account. In the process, I removed the rounding that was being done to the position since older jQuery couldn't handle the fractions. There was another pull for this same issue and I have merged the unit tests from that pull into this commit. Also added flipfit!
Diffstat (limited to 'tests/unit/position/position.html')
-rw-r--r-- | tests/unit/position/position.html | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html index a47e91004..a3a97911c 100644 --- a/tests/unit/position/position.html +++ b/tests/unit/position/position.html @@ -16,7 +16,7 @@ <script src="../testsuite.js"></script> <script src="position_core.js"></script> - <script src="position_core_within.js"></script> + <script src="position_core_within.js"></script> <script src="../swarminject.js"></script> </head> @@ -36,30 +36,34 @@ elements smaller than 10px have a line-height set on them to avoid a bug in IE6 --> <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 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 id="fractions-parent" style="position: absolute; left: 10.7432222px; top: 10.532325px; height: 30px; width: 201px;"> + <div id="fractions-element"></div> + </div> + </div> </div> </body> |