aboutsummaryrefslogtreecommitdiffstats
path: root/themes/default/js/ui/jquery.ui.position.js
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2014-06-24 20:16:59 +0000
committerrvelices <rv-github@modusoptimus.com>2014-06-24 20:16:59 +0000
commit09228a746f3a67ea80ab6cc6013f535da8332a64 (patch)
tree15107374e3de6b8da403af5b75f828c7ea77315b /themes/default/js/ui/jquery.ui.position.js
parent03a3d1830cf67eb468bf4e48a879d2994055a492 (diff)
upgrade jquery ui from 1.10.1 to 1.10.4
git-svn-id: http://piwigo.org/svn/trunk@28780 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'themes/default/js/ui/jquery.ui.position.js')
-rw-r--r--themes/default/js/ui/jquery.ui.position.js22
1 files changed, 13 insertions, 9 deletions
diff --git a/themes/default/js/ui/jquery.ui.position.js b/themes/default/js/ui/jquery.ui.position.js
index 6e4829a92..7c07f4e77 100644
--- a/themes/default/js/ui/jquery.ui.position.js
+++ b/themes/default/js/ui/jquery.ui.position.js
@@ -1,8 +1,8 @@
/*!
- * jQuery UI Position 1.10.1
+ * jQuery UI Position 1.10.4
* http://jqueryui.com
*
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
* Released under the MIT license.
* http://jquery.org/license
*
@@ -70,7 +70,7 @@ $.position = {
return cachedScrollbarWidth;
}
var w1, w2,
- div = $( "<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
+ div = $( "<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
innerDiv = div.children()[0];
$( "body" ).append( div );
@@ -88,23 +88,27 @@ $.position = {
return (cachedScrollbarWidth = w1 - w2);
},
getScrollInfo: function( within ) {
- var overflowX = within.isWindow ? "" : within.element.css( "overflow-x" ),
- overflowY = within.isWindow ? "" : within.element.css( "overflow-y" ),
+ var overflowX = within.isWindow || within.isDocument ? "" :
+ within.element.css( "overflow-x" ),
+ overflowY = within.isWindow || within.isDocument ? "" :
+ within.element.css( "overflow-y" ),
hasOverflowX = overflowX === "scroll" ||
( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
hasOverflowY = overflowY === "scroll" ||
( overflowY === "auto" && within.height < within.element[0].scrollHeight );
return {
- width: hasOverflowX ? $.position.scrollbarWidth() : 0,
- height: hasOverflowY ? $.position.scrollbarWidth() : 0
+ width: hasOverflowY ? $.position.scrollbarWidth() : 0,
+ height: hasOverflowX ? $.position.scrollbarWidth() : 0
};
},
getWithinInfo: function( element ) {
var withinElement = $( element || window ),
- isWindow = $.isWindow( withinElement[0] );
+ isWindow = $.isWindow( withinElement[0] ),
+ isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9;
return {
element: withinElement,
isWindow: isWindow,
+ isDocument: isDocument,
offset: withinElement.offset() || { left: 0, top: 0 },
scrollLeft: withinElement.scrollLeft(),
scrollTop: withinElement.scrollTop(),
@@ -436,7 +440,7 @@ $.ui.position = {
}
}
else if ( overBottom > 0 ) {
- newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
+ newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
position.top += myOffset + atOffset + offset;
}