library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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!

Browse Source
This commit is contained in:
kborchers 2011-08-12 22:19:52 -05:00
parent ac04462d22
commit 80bbebd489
8 changed files with 586 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/position/default.html
View File

@ -142,11 +142,13 @@
<select id="collision_horizontal"> <select id="collision_horizontal">
<option value="flip">flip</option> <option value="flip">flip</option>
<option value="fit">fit</option> <option value="fit">fit</option>
<option value="flipfit">flipfit</option>
<option value="none">none</option> <option value="none">none</option>
</select> </select>
<select id="collision_vertical"> <select id="collision_vertical">
<option value="flip">flip</option> <option value="flip">flip</option>
<option value="fit">fit</option> <option value="fit">fit</option>
<option value="flipfit">flipfit</option>
<option value="none">none</option> <option value="none">none</option>
</select> </select>
</div> </div>

46
tests/unit/position/position.html
View File

@ -16,7 +16,7 @@
<script src="../testsuite.js"></script> <script src="../testsuite.js"></script>
<script src="position_core.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> <script src="../swarminject.js"></script>
</head> </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="qunit-fixture" style="top: 0; left: 0; z-index:1">
<div id="within-container"> <div id="within-container">
<div id="el1" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div> <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="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 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 style="position: absolute; top: 0px; left: 0px">
<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div> <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="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
</div> </div>
<div style="position: absolute; top: 200px; left: 100px;"> <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 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 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-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 id="el-fixed" style="position: fixed; top: 200px; left: 200px;"></div>
</div> </div>
</div> </div>
<div style="position: absolute; height: 5000px; width: 5000px;"></div> <div style="position: absolute; height: 5000px; width: 5000px;"></div>
<div id="bug-5280" style="height: 30px; width: 201px;"> <div id="bug-5280" style="height: 30px; width: 201px;">
<div style="width: 50px; height: 10px;"></div> <div style="width: 50px; height: 10px;"></div>
</div> </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> </div>
</body> </body>

66
tests/unit/position/position_core.js
View File

@ -332,28 +332,28 @@ test( "collision: fit, window scrolled", function() {
test( "collision: flip, no offset", function() { test( "collision: flip, no offset", function() {
collisionTest({ collisionTest({
collision: "flip" collision: "flip"
}, { top: -10, left: -10 }, "left top" ); }, { top: $( window ).height(), left: $( window ).width() }, "left top" );
collisionTest2({ collisionTest2({
collision: "flip" collision: "flip"
}, { top: $( window ).height(), left: $( window ).width() }, "right bottom" ); }, { top: -10, left: -10 }, "right bottom" );
}); });
test( "collision: flip, with offset", function() { test( "collision: flip, with offset", function() {
collisionTest({ collisionTest({
collision: "flip", collision: "flip",
at: "right+2 bottom+3" at: "right+2 bottom+3"
}, { top: -13, left: -12 }, "left top, with offset added" ); }, { top: $( window ).height() + 3, left: $( window ).width() + 2 }, "left top, with offset added" );
collisionTest2({ collisionTest2({
collision: "flip", collision: "flip",
at: "left+2 top+3" at: "left+2 top+3"
}, { top: $( window ).height() - 3, left: $( window ).width() - 2 }, "bottom, positive offset" ); }, { top: -7, left: -8 }, "bottom, positive offset" );
collisionTest2({ collisionTest2({
collision: "flip", collision: "flip",
at: "left-2 top-3" at: "left-2 top-3"
}, { top: $( window ).height() + 3, left: $( window ).width() + 2 }, "right bottom, negative offset" ); }, { top: -13, left: -12 }, "right bottom, negative offset" );
}); });
test( "collision: none, no offset", function() { test( "collision: none, no offset", function() {
@ -427,12 +427,12 @@ test( "collision: flip, with margin", function() {
collisionTest({ collisionTest({
collision: "flip", collision: "flip",
at: "left top" at: "left top"
}, { top: $( window ).height() - 10, left: $( window ).width() - 10 }, "left top" ); }, { top: 0, left: 0 }, "left top" );
collisionTest2({ collisionTest2({
collision: "flip", collision: "flip",
at: "right bottom" at: "right bottom"
}, { top: 0, left: 0 }, "right bottom" ); }, { top: $( window ).height() - 10, left: $( window ).width() - 10 }, "right bottom" );
}); });
test( "addClass: flipped left", function() { test( "addClass: flipped left", function() {
@ -443,7 +443,7 @@ test( "addClass: flipped left", function() {
at: "right center" at: "right center"
}); });
same( elem.hasClass( 'ui-flipped-left' ), true, 'Has ui-flipped-left class' ); same( elem.hasClass( 'ui-flipped-left' ), false, 'Has ui-flipped-left class' );
elem.position( { elem.position( {
my: "right center", my: "right center",
@ -463,7 +463,7 @@ test( "addClass: flipped top", function() {
at: "right bottom" at: "right bottom"
}); });
same( elem.hasClass( 'ui-flipped-top' ), true, 'Has ui-flipped-top class' ); same( elem.hasClass( 'ui-flipped-top' ), false, 'Has ui-flipped-top class' );
elem.position( { elem.position( {
my: "left bottom", my: "left bottom",
@ -483,7 +483,7 @@ test( "addClass: flipped right", function() {
at: "left center" at: "left center"
}); });
same( elem.hasClass( 'ui-flipped-right' ), true, 'Has ui-flipped-right class' ); same( elem.hasClass( 'ui-flipped-right' ), false, 'Has ui-flipped-right class' );
elem.position( { elem.position( {
my: "left center", my: "left center",
@ -504,7 +504,7 @@ test( "addClass: flipped bottom", function() {
at: "right top" at: "right top"
}); });
same( elem.hasClass( 'ui-flipped-bottom' ), true, 'Has ui-flipped-bottom class' ); same( elem.hasClass( 'ui-flipped-bottom' ), false, 'Has ui-flipped-bottom class' );
elem.position( { elem.position( {
my: "left top", my: "left top",
@ -516,22 +516,32 @@ test( "addClass: flipped bottom", function() {
same( elem.hasClass( 'ui-flipped-bottom' ), false, 'Removed ui-flipped-bottom class' ); same( elem.hasClass( 'ui-flipped-bottom' ), false, 'Removed ui-flipped-bottom class' );
}); });
//test( "bug #5280: consistent results (avoid fractional values)", function() { test( "fractions", function() {
// var wrapper = $( "#bug-5280" ), $( "#fractions-element" ).position({
// elem = wrapper.children(), my: "left top",
// offset1 = elem.position({ at: "left top",
// my: "center", of: "#fractions-parent",
// at: "center", collision: "none"
// of: wrapper, });
// collision: "none" same( $( "#fractions-element" ).offset(), $( "#fractions-parent" ).offset(), "left top, left top" );
// }).offset(), });
// offset2 = elem.position({
// my: "center", test( "bug #5280: consistent results (avoid fractional values)", function() {
// at: "center", var wrapper = $( "#bug-5280" ),
// of: wrapper, elem = wrapper.children(),
// collision: "none" offset1 = elem.position({
// }).offset(); my: "center",
// same( offset1, offset2 ); at: "center",
//}); of: wrapper,
collision: "none"
}).offset(),
offset2 = elem.position({
my: "center",
at: "center",
of: wrapper,
collision: "none"
}).offset();
same( offset1, offset2 );
});
}( jQuery ) ); }( jQuery ) );

105
tests/unit/position/position_core_within.js
View File

@ -7,7 +7,7 @@ function scrollTopSupport() {
module( "position - within", { module( "position - within", {
setup: function(){ setup: function(){
$("#within-container").css({"width": "500px", "height": "500px", "top": "20px", "left": "20px", "position": "relative"}).show(); $("#within-container").css({"width": "70px", "height": "70px", "top": "20px", "left": "20px", "position": "relative"}).show();
} }
}); });
@ -226,7 +226,7 @@ test( "using", function() {
expectedPosition = { top: addTop + 40, left: addLeft + 40 }, expectedPosition = { top: addTop + 40, left: addLeft + 40 },
originalPosition = elems.position({ originalPosition = elems.position({
my: "right bottom", my: "right bottom",
at: "rigt bottom", at: "right bottom",
of: "#parentx", of: "#parentx",
collision: "none", collision: "none",
within: within within: within
@ -257,7 +257,7 @@ function collisionTest( config, result, msg ) {
var elem = $( "#elx" ).position( $.extend({ var elem = $( "#elx" ).position( $.extend({
my: "left top", my: "left top",
at: "right bottom", at: "right bottom",
of: within[0], of: "#parentx",
within: within within: within
}, config ) ); }, config ) );
@ -272,128 +272,136 @@ function collisionTest2( config, result, msg ) {
} }
test( "collision: fit, no offset", function() { test( "collision: fit, no offset", function() {
var within = $("#within-container"); var within = $("#within-container"),
of = $("#parentx");
collisionTest({ collisionTest({
collision: "fit" collision: "fit"
}, { top: addTop + within.height() - 10 - $.position.getScrollInfo( within ).height, left: addLeft + within.width() - 10 - $.position.getScrollInfo( within ).width }, "right bottom" ); }, { top: addTop + of.position().top + of.height() - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - $.position.getScrollInfo( within ).width }, "right bottom" );
collisionTest2({ collisionTest2({
collision: "fit" collision: "fit"
}, { top: addTop + 0, left: addLeft + 0 }, "left top" ); }, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
}); });
test( "collision: fit, with offset", function() { test( "collision: fit, with offset", function() {
var within = $("#within-container"); var within = $("#within-container"),
of = $("#parentx");
collisionTest({ collisionTest({
collision: "fit", collision: "fit",
at: "right+2 bottom+3" at: "right+2 bottom+3"
}, { top: addTop + within.height() - 10 - $.position.getScrollInfo( within ).height, left: addLeft + within.width() - 10 - $.position.getScrollInfo( within ).width }, "right bottom"); }, { top: addTop + of.position().top + of.height() - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - $.position.getScrollInfo( within ).width }, "right bottom");
collisionTest2({ collisionTest2({
collision: "fit", collision: "fit",
at: "left+2 top+3" at: "left+2 top+3"
}, { top: addTop + 0, left: addLeft + 0 }, "left top, positive offset" ); }, { top: addTop + of.position().top - 7, left: addLeft + of.position().left - 8 }, "left top, positive offset" );
collisionTest2({ collisionTest2({
collision: "fit", collision: "fit",
at: "left-2 top-3" at: "left-2 top-3"
}, { top: addTop + 0, left: addLeft + 0 }, "left top, negative offset" ); }, { top: addTop + of.position().top - 13, left: addLeft + of.position().left - 12 }, "left top, negative offset" );
}); });
test( "collision: fit, within scrolled", function() { test( "collision: none, within scrolled", function() {
if ( scrollTopSupport() ) { if ( scrollTopSupport() ) {
var within = $("#within-container").css({"width": "1000px", "height": "800px", "overflow": "auto"}); var within = $("#within-container").css({"width": "1000px", "height": "800px", "overflow": "auto"}),
of = $("#parentx");
within.scrollTop( 300 ).scrollLeft( 150 ); within.scrollTop( 300 ).scrollLeft( 150 );
collisionTest({ collisionTest({
collision: "fit", collision: "none",
at: "left-100 top-100" at: "left-100 top-100"
}, { top: addTop, left: addLeft }, "top left" ); }, { top: of.offset().top + addTop - 100 - of.height(), left: of.offset().left + addLeft - 100 - of.width() }, "top left" );
collisionTest2({ collisionTest2({
collision: "fit", collision: "none",
at: "right+100 bottom+100" at: "right+100 bottom+100"
}, { top: addTop + within.height() - 10 - $.position.getScrollInfo( within ).height, left: addLeft + within.width() - 10 - $.position.getScrollInfo( within ).width }, "right bottom" ); }, { top: of.offset().top + addTop + 100 - 10, left: of.offset().left + addLeft + 100 - 10 }, "right bottom" );
within.scrollTop( 0 ).scrollLeft( 0 ); within.scrollTop( 0 ).scrollLeft( 0 );
} }
}); });
test( "collision: flip, no offset", function() { test( "collision: flip, no offset", function() {
var within = $("#within-container"); var within = $("#within-container"),
of = $("#parentx");
collisionTest({ collisionTest({
collision: "flip" collision: "flip"
}, { top: addTop + -10, left: addLeft + -10 }, "left top" ); }, { top: addTop + of.position().top + of.height(), left: addLeft + of.position().left + of.width() }, "left top" );
collisionTest2({ collisionTest2({
collision: "flip" collision: "flip"
}, { top: addTop + within.height(), left: addLeft + within.width() }, "right bottom" ); }, { top: addTop + of.position().top - 10, left: addTop + of.position().top - 10 }, "right bottom" );
}); });
test( "collision: flip, with offset", function() { test( "collision: flip, with offset", function() {
var within = $("#within-container"); var within = $("#within-container"),
of = $("#parentx");
collisionTest({ collisionTest({
collision: "flip", collision: "flip",
at: "right+2 bottom+3" at: "right+2 bottom+3"
}, { top: addTop + -13, left: addLeft + -12 }, "left top, with offset added" ); }, { top: addTop + of.position().top - 13, left: addLeft + of.position().left - 12 }, "left top, with offset added" );
collisionTest2({ collisionTest2({
collision: "flip", collision: "flip",
at: "left+2 top+3" at: "left+2 top+3"
}, { top: addTop + within.height() - 3, left: addLeft + within.width() - 2 }, "bottom, positive offset" ); }, { top: addTop + of.position().top - 10 + 3, left: addLeft + of.position().left - 10 + 2 }, "right bottom, positive offset" );
collisionTest2({ collisionTest2({
collision: "flip", collision: "flip",
at: "left-2 top-3" at: "left-2 top-3"
}, { top: addTop + within.height() + 3, left: addLeft + within.width() + 2 }, "right bottom, negative offset" ); }, { top: addTop + of.position().top - 13, left: addLeft + of.position().left - 12 }, "right bottom, negative offset" );
}); });
test( "collision: none, no offset", function() { test( "collision: none, no offset", function() {
var within = $("#within-container"); var within = $("#within-container"),
of = $("#parentx");
collisionTest({ collisionTest({
collision: "none" collision: "none"
}, { top: addTop + within.height(), left: addLeft + within.width() }, "left top" ); }, { top: addTop + of.position().top + of.height(), left: addLeft + of.position().left + of.width() }, "left top" );
collisionTest2({ collisionTest2({
collision: "none" collision: "none"
}, { top: addTop + -10, left: addLeft + -10 }, "moved to the right bottom" ); }, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "right bottom" );
}); });
test( "collision: none, with offset", function() { test( "collision: none, with offset", function() {
var within = $("#within-container"); var within = $("#within-container"),
of = $("#parentx");
collisionTest({ collisionTest({
collision: "none", collision: "none",
at: "right+2 bottom+3" at: "right+2 bottom+3"
}, { top: addTop + within.height() + 3, left: addLeft + within.width() + 2 }, "right bottom, with offset added" ); }, { top: addTop + of.position().top + of.height() + 3, left: addLeft + of.position().left + of.width() + 2 }, "right bottom, with offset added" );
collisionTest2({ collisionTest2({
collision: "none", collision: "none",
at: "left+2 top+3" at: "left+2 top+3"
}, { top: addTop + -7, left: addLeft + -8 }, "left top, positive offset" ); }, { top: addTop + of.position().top - 7, left: addTop + of.position().top - 8 }, "left top, positive offset" );
collisionTest2({ collisionTest2({
collision: "none", collision: "none",
at: "left-2 top-3" at: "left-2 top-3"
}, { top: addTop + -13, left: addLeft + -12 }, "left top, negative offset" ); }, { top: addTop + of.position().top - 13, left: addTop + of.position().top - 12 }, "left top, negative offset" );
}); });
test( "collision: fit, with margin", function() { test( "collision: fit, with margin", function() {
var within = $("#within-container"); var within = $("#within-container"),
of = $("#parentx");
$( "#elx" ).css( "margin", 10 ); $( "#elx" ).css( "margin", 10 );
collisionTest({ collisionTest({
collision: "fit" collision: "fit"
}, { top: addTop + within.height() - 20 - $.position.getScrollInfo( within ).height, left: addLeft + within.width() - 20 - $.position.getScrollInfo( within ).width }, "right bottom" ); }, { top: addTop + of.position().top + of.height() - 10 - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - 10 - $.position.getScrollInfo( within ).width }, "right bottom" );
collisionTest2({ collisionTest2({
collision: "fit" collision: "fit"
}, { top: addTop + 10, left: addLeft + 10 }, "left top" ); }, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
$( "#elx" ).css({ $( "#elx" ).css({
"margin-left": 5, "margin-left": 5,
@ -402,11 +410,11 @@ test( "collision: fit, with margin", function() {
collisionTest({ collisionTest({
collision: "fit" collision: "fit"
}, { top: addTop + within.height() - 20 - $.position.getScrollInfo( within ).height, left: addLeft + within.width() - 20 - $.position.getScrollInfo( within ).width }, "right bottom" ); }, { top: addTop + of.position().top + of.height() - 10 - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - 10 - $.position.getScrollInfo( within ).width }, "right bottom" );
collisionTest2({ collisionTest2({
collision: "fit" collision: "fit"
}, { top: addTop + 5, left: addLeft + 5 }, "left top" ); }, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
$( "#elx" ).css({ $( "#elx" ).css({
"margin-right": 15, "margin-right": 15,
@ -415,27 +423,28 @@ test( "collision: fit, with margin", function() {
collisionTest({ collisionTest({
collision: "fit" collision: "fit"
}, { top: addTop + within.height() - 25 - $.position.getScrollInfo( within ).height, left: addLeft + within.width() - 25 - $.position.getScrollInfo( within ).width }, "right bottom" ); }, { top: addTop + of.position().top + of.height() - 15 - $.position.getScrollInfo( within ).height, left: addLeft + of.position().left + of.width() - 15 - $.position.getScrollInfo( within ).width }, "right bottom" );
collisionTest2({ collisionTest2({
collision: "fit" collision: "fit"
}, { top: addTop + 5, left: addLeft + 5 }, "left top" ); }, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
}); });
test( "collision: flip, with margin", function() { test( "collision: flip, with margin", function() {
var within = $("#within-container"); var within = $("#within-container"),
of = $("#parentx");
$( "#elx" ).css( "margin", 10 ); $( "#elx" ).css( "margin", 10 );
collisionTest({ collisionTest({
collision: "flip", collision: "flip"
at: "left top" }, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "left top" );
}, { top: addTop + within.height() - 10, left: addLeft + within.width() - 10 }, "left top" );
collisionTest2({ collisionTest2({
collision: "flip", collision: "flip"
at: "right bottom" }, { top: addTop + of.position().top - 10, left: addLeft + of.position().left - 10 }, "right bottom" );
}, { top: addTop + 0, left: addLeft + 0 }, "right bottom" );
$( "#elx" ).css( "margin", 0 );
}); });
test( "addClass: flipped left", function() { test( "addClass: flipped left", function() {
@ -449,7 +458,7 @@ test( "addClass: flipped left", function() {
at: "right center" at: "right center"
}); });
same( elem.hasClass( 'ui-flipped-left' ), true, 'Has ui-flipped-left class' ); same( elem.hasClass( 'ui-flipped-left' ), false, 'Has ui-flipped-left class' );
elem.position( { elem.position( {
my: "right center", my: "right center",
@ -473,7 +482,7 @@ test( "addClass: flipped top", function() {
at: "right bottom" at: "right bottom"
}); });
same( elem.hasClass( 'ui-flipped-top' ), true, 'Has ui-flipped-top class' ); same( elem.hasClass( 'ui-flipped-top' ), false, 'Has ui-flipped-top class' );
elem.position( { elem.position( {
my: "left bottom", my: "left bottom",
@ -497,7 +506,7 @@ test( "addClass: flipped right", function() {
at: "left center" at: "left center"
}); });
same( elem.hasClass( 'ui-flipped-right' ), true, 'Has ui-flipped-right class' ); same( elem.hasClass( 'ui-flipped-right' ), false, 'Has ui-flipped-right class' );
elem.position( { elem.position( {
my: "left center", my: "left center",
@ -521,7 +530,7 @@ test( "addClass: flipped bottom", function() {
at: "right top" at: "right top"
}); });
same( elem.hasClass( 'ui-flipped-bottom' ), true, 'Has ui-flipped-bottom class' ); same( elem.hasClass( 'ui-flipped-bottom' ), false, 'Has ui-flipped-bottom class' );
elem.position( { elem.position( {
my: "left top", my: "left top",

148
tests/visual/position/position_fit.html Normal file
View File

@ -0,0 +1,148 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>Position Visual Test: Fit</title>
<link rel="stylesheet" href="../visual.css" type="text/css" />
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
<script type="text/javascript" src="../../../jquery-1.6.2.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script>
<script type="text/javascript">
$(function() {
var inputs = $("input");
$("ul").insertAfter(inputs);
inputs.each(function(index) {
$(this).position({
my: this.id.replace(/-/, " "),
at: this.id.replace(/-/, " "),
of: "#container"+index,
collision: "none"
});
if(index < 3) {
$(this).next().menu().position({
my: "left top",
at: "left bottom",
of: this,
within: "#container"+index,
collision: "fit"
});
}
if(index >= 3 && index < 6) {
$(this).next().menu().position({
my: "right top",
at: "right bottom",
of: this,
within: "#container"+index,
collision: "fit"
});
}
if(index >= 6 && index < 9) {
$(this).next().menu().position({
my: "center top",
at: "center bottom",
of: this,
within: "#container"+index,
collision: "fit"
});
}
if(index >= 9 && index < 12) {
$(this).next().menu().position({
my: "left top",
at: "left bottom",
of: this,
within: "#container"+index,
collision: "fit"
});
}
if(index >= 12 && index < 15) {
$(this).next().menu().position({
my: "center center",
at: "center center",
of: this,
within: "#container"+index,
collision: "fit"
});
}
if(index >= 15) {
$(this).next().menu().position({
my: "left bottom",
at: "left top",
of: this,
within: "#container"+index,
collision: "fit"
});
}
});
});
</script>
<style>
input, .ui-menu { position: absolute; }
.ui-menu { width: 300px; }
#ui-menu-9, #ui-menu-10, #ui-menu-11, #ui-menu-12, #ui-menu-13, #ui-menu-14, #ui-menu-15, #ui-menu-16, #ui-menu-17 { width: auto; }
html, body { width: 99%; height: 99%; min-height:700px; min-width:700px; }
.container { width: 200px; height: 200px; border: 1px solid black; display:inline-block; margin-left: 230px; margin-top: 15px; margin-bottom: 135px; }
.container2 { width: 200px; height: 100px; border: 1px solid black; display:inline-block; margin-left: 230px; margin-top: 15px; margin-bottom: 135px; }
</style>
</head>
<body>
<div id="container0" class="container"></div>
<div id="container1" class="container"></div>
<div id="container2" class="container"></div>
<div style="clear:both;"></div>
<div id="container3" class="container"></div>
<div id="container4" class="container"></div>
<div id="container5" class="container"></div>
<div style="clear:both;"></div>
<div id="container6" class="container"></div>
<div id="container7" class="container"></div>
<div id="container8" class="container"></div>
<div style="clear:both;"></div>
<div id="container9" class="container2"></div>
<div id="container10" class="container2"></div>
<div id="container11" class="container2"></div>
<div style="clear:both;"></div>
<div id="container12" class="container2"></div>
<div id="container13" class="container2"></div>
<div id="container14" class="container2"></div>
<div style="clear:both;"></div>
<div id="container15" class="container2"></div>
<div id="container16" class="container2"></div>
<div id="container17" class="container2"></div>
<input id="left-top" />
<input id="center-top" />
<input id="right-top" />
<input id="left-top" />
<input id="center-top" />
<input id="right-top" />
<input id="left-top" />
<input id="center-top" />
<input id="right-top" />
<input id="left-top" />
<input id="center-center" />
<input id="right-bottom" />
<input id="left-top" />
<input id="center-center" />
<input id="right-bottom" />
<input id="left-top" />
<input id="center-center" />
<input id="right-bottom" />
<ul>
<li><a href="#">Java</a></li>
<li><a href="#">JavaScript</a></li>
<li><a href="#">Perl</a></li>
<li><a href="#">Ruby</a></li>
<li><a href="#">C++</a></li>
<li><a href="#">Python</a></li>
<li><a href="#">C#</a></li>
</ul>
</body>
</html>

77
tests/visual/position/position_flip.html Normal file
View File

@ -0,0 +1,77 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>Position Visual Test: Flip</title>
<link rel="stylesheet" href="../visual.css" type="text/css" />
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
<script type="text/javascript" src="../../../jquery-1.6.2.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script>
<script type="text/javascript">
$(function() {
var inputs = $("input");
$("ul").insertAfter(inputs);
inputs.each(function(index) {
$(this).position({
my: this.id.replace(/-/, " "),
at: this.id.replace(/-/, " "),
of: "#container"+index,
collision: "none"
});
$(this).next().menu().position({
my: "left top",
at: "left bottom",
of: this,
within: "#container"+index
});
});
});
</script>
<style>
input, .ui-menu { position: absolute; }
.ui-menu { width: 300px; }
#ui-menu-6, #ui-menu-7, #ui-menu-8 { width: auto; }
html, body { width: 99%; height: 99%; min-height:700px; min-width:700px; }
.container { width: 200px; height: 200px; border: 1px solid black; display:inline-block; margin-left: 230px; margin-top: 150px; }
</style>
</head>
<body>
<div id="container0" class="container"></div>
<div id="container1" class="container"></div>
<div id="container2" class="container"></div><br>
<div style="clear:both;"></div>
<div id="container3" class="container" style="width:300px;"></div>
<div id="container4" class="container" style="width:300px;"></div>
<div id="container5" class="container" style="width:300px;"></div>
<div style="clear:both;"></div>
<div id="container6" class="container" style="height:100px; margin-bottom: 500px;"></div>
<div id="container7" class="container" style="height:100px; margin-bottom: 500px;"></div>
<div id="container8" class="container" style="height:100px; margin-bottom: 500px;"></div>
<input id="left-top" />
<input id="center-top" />
<input id="right-top" />
<input id="left-center" />
<input id="center-center" />
<input id="right-center" />
<input id="left-bottom" />
<input id="center-center" />
<input id="right-bottom" />
<ul>
<li><a href="#">Java</a></li>
<li><a href="#">JavaScript</a></li>
<li><a href="#">Perl</a></li>
<li><a href="#">Ruby</a></li>
<li><a href="#">C++</a></li>
<li><a href="#">Python</a></li>
<li><a href="#">C#</a></li>
</ul>
</body>
</html>

86
tests/visual/position/position_flipfit.html Normal file
View File

@ -0,0 +1,86 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<title>Position Visual Test: FlipFit</title>
<link rel="stylesheet" href="../visual.css" type="text/css" />
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
<script type="text/javascript" src="../../../jquery-1.6.2.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script>
<script type="text/javascript">
$(function() {
var inputs = $("input");
$("ul").insertAfter(inputs);
inputs.each(function(index) {
$(this).position({
my: this.id.replace(/-/, " "),
at: this.id.replace(/-/, " "),
of: "#container"+index,
collision: "none"
});
$(this).next().menu().position({
my: index > 2 && index < 6 ? "right top" : "left top",
at: index > 2 && index < 6 ? "right bottom" : "left bottom",
of: this,
within: "#container"+index,
collision: "flipfit"
});
});
});
</script>
<style>
input, .ui-menu { position: absolute; }
.ui-menu { width: 300px; }
#ui-menu-3, #ui-menu-4, #ui-menu-5 { width: 185px; }
#ui-menu-9, #ui-menu-10, #ui-menu-11 { width: auto; }
html, body { width: 99%; height: 99%; min-height:700px; min-width:700px; }
.container { width: 200px; height: 200px; border: 1px solid black; display:inline-block; margin-left: 230px; margin-top: 150px; }
</style>
</head>
<body>
<div id="container0" class="container"></div>
<div id="container1" class="container"></div>
<div id="container2" class="container"></div><br>
<div style="clear:both;"></div>
<div id="container3" class="container"></div>
<div id="container4" class="container"></div>
<div id="container5" class="container"></div><br>
<div style="clear:both;"></div>
<div id="container6" class="container" style="width:300px;"></div>
<div id="container7" class="container" style="width:300px;"></div>
<div id="container8" class="container" style="width:300px;"></div>
<div style="clear:both;"></div>
<div id="container9" class="container" style="height:100px; margin-bottom: 500px;"></div>
<div id="container10" class="container" style="height:100px; margin-bottom: 500px;"></div>
<div id="container11" class="container" style="height:100px; margin-bottom: 500px;"></div>
<input id="left-top" />
<input id="center-top" />
<input id="right-top" />
<input id="left-top" />
<input id="center-top" />
<input id="right-top" />
<input id="left-center" />
<input id="center-center" />
<input id="right-center" />
<input id="left-bottom" />
<input id="center-center" />
<input id="right-bottom" />
<ul>
<li><a href="#">Java</a></li>
<li><a href="#">JavaScript</a></li>
<li><a href="#">Perl</a></li>
<li><a href="#">Ruby</a></li>
<li><a href="#">C++</a></li>
<li><a href="#">Python</a></li>
<li><a href="#">C#</a></li>
</ul>
</body>
</html>

156
ui/jquery.ui.position.js vendored
View File

@ -39,15 +39,16 @@ $.position = {
return w1 - w2; return w1 - w2;
}, },
getScrollInfo: function( within ) { getScrollInfo: function(within) {
var that = within[0], var notWindow = within[0] !== window,
scrollHeight = within.height() < that.scrollHeight, overflowX = notWindow ? within.css( "overflow-x" ) : "",
scrollWidth = within.width() < that.scrollWidth, overflowY = notWindow ? within.css( "overflow-y" ) : "",
scrollbarWidth = $.position.scrollbarWidth(); scrollbarWidth = overflowX === "auto" || overflowX === "scroll" ? $.position.scrollbarWidth() : 0,
scrollbarHeight = overflowY === "auto" || overflowY === "scroll" ? $.position.scrollbarWidth() : 0;
return { return {
height: scrollHeight ? scrollbarWidth : 0, height: within.height() < within[0].scrollHeight ? scrollbarHeight : 0,
width : scrollWidth ? scrollbarWidth : 0 width: within.width() < within[0].scrollWidth ? scrollbarWidth : 0
}; };
} }
}; };
@ -182,13 +183,9 @@ $.fn.position = function( options ) {
position.left += myOffset[ 0 ]; position.left += myOffset[ 0 ];
position.top += myOffset[ 1 ]; position.top += myOffset[ 1 ];
// prevent fractions (see #5280)
position.left = Math.round( position.left );
position.top = Math.round( position.top );
collisionPosition = { collisionPosition = {
left: position.left - marginLeft, marginLeft: marginLeft,
top: position.top - marginTop marginTop: marginTop
}; };
$.each( [ "left", "top" ], function( i, dir ) { $.each( [ "left", "top" ], function( i, dir ) {
@ -225,18 +222,38 @@ $.ui.position = {
isWindow = $.isWindow( data.within[0] ), isWindow = $.isWindow( data.within[0] ),
withinOffset = isWindow ? win.scrollLeft() : within.offset().left, withinOffset = isWindow ? win.scrollLeft() : within.offset().left,
outerWidth = isWindow ? win.width() : within.outerWidth(), outerWidth = isWindow ? win.width() : within.outerWidth(),
overLeft = withinOffset - data.collisionPosition.left, collisionPosLeft = position.left - data.collisionPosition.marginLeft,
overRight = data.collisionPosition.left + data.collisionWidth - outerWidth - withinOffset; overLeft = withinOffset - collisionPosLeft,
overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
newOverRight,
newOverLeft;
// element is wider than window or too far left -> align with left edge // element is wider than within
if ( data.collisionWidth > outerWidth || overLeft > 0 ) { if ( data.collisionWidth > outerWidth ) {
// element is initially over the left side of within
if ( overLeft > 0 && overRight <= 0 ) {
newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
position.left += overLeft - newOverRight;
// element is initially over right side of within
} else if ( overRight > 0 && overLeft <= 0 ) {
position.left = withinOffset;
// element is initially over both left and right sides of within
} else {
if ( overLeft > overRight ) {
position.left = withinOffset + outerWidth - data.collisionWidth;
} else {
position.left = withinOffset;
}
}
// too far left -> align with left edge
} else if ( overLeft > 0 ) {
position.left += overLeft; position.left += overLeft;
// too far right -> align with right edge // too far right -> align with right edge
} else if ( overRight > 0 ) { } else if ( overRight > 0 ) {
position.left -= overRight; position.left -= overRight;
// adjust based on position and margin // adjust based on position and margin
} else { } else {
position.left = Math.max( position.left - data.collisionPosition.left, position.left ); position.left = Math.max( position.left - collisionPosLeft, position.left );
} }
}, },
top: function( position, data ) { top: function( position, data ) {
@ -245,18 +262,38 @@ $.ui.position = {
isWindow = $.isWindow( data.within[0] ), isWindow = $.isWindow( data.within[0] ),
withinOffset = isWindow ? win.scrollTop() : within.offset().top, withinOffset = isWindow ? win.scrollTop() : within.offset().top,
outerHeight = isWindow ? win.height() : within.outerHeight(), outerHeight = isWindow ? win.height() : within.outerHeight(),
overTop = withinOffset - data.collisionPosition.top, collisionPosTop = position.top - data.collisionPosition.marginTop,
overBottom = data.collisionPosition.top + data.collisionHeight - outerHeight - withinOffset; overTop = withinOffset - collisionPosTop,
overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
newOverTop,
newOverBottom;
// element is taller than window or too far up -> align with top edge // element is taller than within
if ( data.collisionHeight > outerHeight || overTop > 0 ) { if ( data.collisionHeight > outerHeight ) {
// element is initially over the top of within
if ( overTop > 0 && overBottom <= 0 ) {
newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
position.top += overTop - newOverBottom;
// element is initially over bottom of within
} else if ( overBottom > 0 && overTop <= 0 ) {
position.top = withinOffset;
// element is initially over both top and bottom of within
} else {
if ( overTop > overBottom ) {
position.top = withinOffset + outerHeight - data.collisionHeight;
} else {
position.top = withinOffset;
}
}
// too far up -> align with top
} else if ( overTop > 0 ) {
position.top += overTop; position.top += overTop;
// too far down -> align with bottom edge // too far down -> align with bottom edge
} else if ( overBottom > 0 ) { } else if ( overBottom > 0 ) {
position.top -= overBottom; position.top -= overBottom;
// adjust based on position and margin // adjust based on position and margin
} else { } else {
position.top = Math.max( position.top - data.collisionPosition.top, position.top ); position.top = Math.max( position.top - collisionPosTop, position.top );
} }
} }
}, },
@ -272,10 +309,11 @@ $.ui.position = {
var within = data.within, var within = data.within,
win = $( window ), win = $( window ),
isWindow = $.isWindow( data.within[0] ), isWindow = $.isWindow( data.within[0] ),
withinOffset = isWindow ? 0 : within.offset().left, withinOffset = ( isWindow ? 0 : within.offset().left ) + within.scrollLeft(),
outerWidth = isWindow ? within.width() : within.outerWidth(), outerWidth = isWindow ? within.width() : within.outerWidth(),
overLeft = data.collisionPosition.left - withinOffset, collisionPosLeft = position.left - data.collisionPosition.marginLeft,
overRight = data.collisionPosition.left + data.collisionWidth - outerWidth - withinOffset, overLeft = collisionPosLeft - withinOffset,
overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
left = data.my[ 0 ] === "left", left = data.my[ 0 ] === "left",
myOffset = data.my[ 0 ] === "left" ? myOffset = data.my[ 0 ] === "left" ?
-data.elemWidth : -data.elemWidth :
@ -285,13 +323,27 @@ $.ui.position = {
atOffset = data.at[ 0 ] === "left" ? atOffset = data.at[ 0 ] === "left" ?
data.targetWidth : data.targetWidth :
-data.targetWidth, -data.targetWidth,
offset = -2 * data.offset[ 0 ]; offset = -2 * data.offset[ 0 ],
if ( overLeft < 0 || overRight > 0 ) { newOverRight,
newOverLeft;
data.elem if ( overLeft < 0 ) {
.addClass( "ui-flipped-" + ( overLeft < 0 ? "right" : "left" ) ); newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
if ( newOverRight < 0 || newOverRight < Math.abs( overLeft ) ) {
data.elem
.addClass( "ui-flipped-right" );
position.left += myOffset + atOffset + offset; position.left += myOffset + atOffset + offset;
}
}
else if ( overRight > 0 ) {
newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - withinOffset;
if ( newOverLeft > 0 || Math.abs( newOverLeft ) < overRight ) {
data.elem
.addClass( "ui-flipped-left" );
position.left += myOffset + atOffset + offset;
}
} }
}, },
top: function( position, data ) { top: function( position, data ) {
@ -305,10 +357,11 @@ $.ui.position = {
var within = data.within, var within = data.within,
win = $( window ), win = $( window ),
isWindow = $.isWindow( data.within[0] ), isWindow = $.isWindow( data.within[0] ),
withinOffset = isWindow ? 0 : within.offset().top, withinOffset = ( isWindow ? 0 : within.offset().top ) + within.scrollTop(),
outerHeight = isWindow ? within.height() : within.outerHeight(), outerHeight = isWindow ? within.height() : within.outerHeight(),
overTop = data.collisionPosition.top - withinOffset, collisionPosTop = position.top - data.collisionPosition.marginTop,
overBottom = data.collisionPosition.top + data.collisionHeight - outerHeight - withinOffset, overTop = collisionPosTop - withinOffset,
overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
top = data.my[ 1 ] === "top", top = data.my[ 1 ] === "top",
myOffset = top ? myOffset = top ?
-data.elemHeight : -data.elemHeight :
@ -318,14 +371,37 @@ $.ui.position = {
atOffset = data.at[ 1 ] === "top" ? atOffset = data.at[ 1 ] === "top" ?
data.targetHeight : data.targetHeight :
-data.targetHeight, -data.targetHeight,
offset = -2 * data.offset[ 1 ]; offset = -2 * data.offset[ 1 ],
if ( overTop < 0 || overBottom > 0 ) { newOverTop,
newOverBottom;
if ( overTop < 0 ) {
newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
if ( newOverBottom < 0 || newOverBottom < Math.abs( overTop ) ) {
data.elem
.addClass( "ui-flipped-bottom" );
data.elem position.top += myOffset + atOffset + offset;
.addClass( "ui-flipped-" + ( overTop < 0 ? "bottom" : "top" ) ); }
position.top += myOffset + atOffset + offset;
} }
else if ( overBottom > 0 ) {
newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - withinOffset;
if ( newOverTop > 0 || Math.abs( newOverTop ) < overBottom ) {
data.elem
.addClass( "ui-flipped-top" );
position.top += myOffset + atOffset + offset;
}
}
}
},
flipfit: {
left: function() {
$.ui.position.flip.left.apply( this, arguments );
$.ui.position.fit.left.apply( this, arguments );
},
top: function() {
$.ui.position.flip.top.apply( this, arguments );
$.ui.position.fit.top.apply( this, arguments );
} }
} }
}; };