Skip to content
Closed
Changes from all commits
Commits
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
45 changes: 36 additions & 9 deletions ui/jquery.ui.position.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,47 @@ $.ui.position = {
fit: {
left: function( position, data ) {
var win = $( window ),
over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft();
position.left = over > 0 ?
position.left - over :
Math.max( position.left - data.collisionPosition.left, position.left );
overLeft = win.scrollLeft() - data.collisionPosition.left,
overRight = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft();
/*
Cases considered:
1) element width does not fit. Left align on left border of screen
2) element is too far left, bring back on left side of screen
3) element is too far right, bring back on right side of the screen
4) set element accordingly while making sure it's more than leftMargin from the left border of the document
*/

if( data.collisionWidth > win.width() || overLeft > 0 ) {
position.left = position.left + overLeft;
} else if( overRight > 0) {
position.left = position.left - overRight;
} else {
position.left = Math.max( position.left - data.collisionPosition.left, position.left );
}
},
top: function( position, data ) {
var win = $( window ),
over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop();
position.top = over > 0 ?
position.top - over :
Math.max( position.top - data.collisionPosition.top, position.top );
overTop = win.scrollTop() - data.collisionPosition.top,
overBottom = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop();

/*
Cases considered:
1) element height does not fit. Top align on top border of screen
2) element is too far up, bring back on top of screen
3) element is too far down, bring back on bottom of the screen
4) set element accordingly while making sure it's more than topMargin from the top of the document
*/

if( data.collisionHeight > win.height() || overTop > 0 ) {
position.top = position.top + overTop;
} else if(overBottom > 0) {
position.top = position.top - overBottom;
} else {
position.top = Math.max( position.top - data.collisionPosition.top, position.top );
}
}
},

},
flip: {
left: function( position, data ) {
if ( data.at[ 0 ] === center ) {
Expand Down