Changeset 28780 for trunk/themes/default/js/ui/jquery.ui.position.js

Timestamp:

Jun 24, 2014, 10:16:59 PM (10 years ago)

Author:

rvelices

Message:

upgrade jquery ui from 1.10.1 to 1.10.4

File:

• trunk/themes/default/js/ui/jquery.ui.position.js (modified) (5 diffs)

trunk/themes/default/js/ui/jquery.ui.position.js

@@ -1 +1 @@
 /*!
- * 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
@@ -71 +71 @@
                 }
                 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];
 
@@ -89 +89 @@
         },
         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 ),
@@ -96 +98 @@
                                 ( 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(),
@@ -437 +441 @@
                         }
                         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;