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

Now takes scrollbar width into account in collision detection

Browse Source
This commit is contained in:
David Murdoch 2011-05-26 00:53:16 +00:00
parent e4a42991df
commit c11ac9c3f3
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,32 @@ var rhorizontal = /left|center|right/,
rposition = /^\w+/, rposition = /^\w+/,
rpercent = /%$/, rpercent = /%$/,
center = "center", center = "center",
_position = $.fn.position; _position = $.fn.position,
getScrollbarWidth = function() {
var div = $( "<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
innerDiv = div.children()[0],
w1, w2;
$( "body" ).append( div );
w1 = innerDiv.offsetWidth;
div.css( "overflow", "scroll" );
w2 = innerDiv.offsetWidth;
if ( w1 === w2 ) {
w2 = div[0].clientWidth;
}
div.remove();
return w1 - w2;
},
getScrollInfo = function( within ) {
var that = within[0],
scrollHeight = within.height() < that.scrollHeight,
scrollWidth = within.width() < that.scrollWidth,
scrollbarWidth = getScrollbarWidth();
return { height : scrollHeight ? scrollbarWidth : 0, width : scrollWidth ? scrollbarWidth : 0 };
};
$.fn.position = function( options ) { $.fn.position = function( options ) {
if ( !options || !options.of ) { if ( !options || !options.of ) {
@ -114,16 +139,17 @@ $.fn.position = function( options ) {
basePosition.left += atOffset[ 0 ]; basePosition.left += atOffset[ 0 ];
basePosition.top += atOffset[ 1 ]; basePosition.top += atOffset[ 1 ];
return this.each(function() { return this.each(function() { console.log(getScrollInfo( within ));
var elem = $( this ), var elem = $( this ),
elemWidth = elem.outerWidth(), elemWidth = elem.outerWidth(),
elemHeight = elem.outerHeight(), elemHeight = elem.outerHeight(),
marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0, marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0, marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
scrollInfo = getScrollInfo( within ),
collisionWidth = elemWidth + marginLeft + collisionWidth = elemWidth + marginLeft +
( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ), ( parseInt( $.curCSS( this, "marginRight", true ) ) || 0 ) + scrollInfo.width,
collisionHeight = elemHeight + marginTop + collisionHeight = elemHeight + marginTop +
( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ), ( parseInt( $.curCSS( this, "marginBottom", true ) ) || 0 ) + scrollInfo.height,
position = $.extend( {}, basePosition ), position = $.extend( {}, basePosition ),
myOffset = [ myOffset = [
parseInt( offsets.my[ 0 ], 10 ) * parseInt( offsets.my[ 0 ], 10 ) *