Changeset 12525 for trunk/themes/default/js/ui/jquery.ui.resizable.js

Timestamp:

Oct 28, 2011, 3:25:54 PM (13 years ago)

Author:

patdenice

Message:

feature:2487
Update jQuery to 1.6.4 and jQuery UI to 1.8.16

File:

• trunk/themes/default/js/ui/jquery.ui.resizable.js (modified) (7 diffs)

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

@@ -1 +1 @@
 /*
- * jQuery UI Resizable 1.8.10
+ * jQuery UI Resizable 1.8.16
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
@@ -177 +177 @@
                                 .addClass("ui-resizable-autohide")
                                 .hover(function() {
+                                        if (o.disabled) return;
                                         $(this).removeClass("ui-resizable-autohide");
                                         self._handles.show();
                                 },
                                 function(){
+                                        if (o.disabled) return;
                                         if (!self.resizing) {
                                                 $(this).addClass("ui-resizable-autohide");
@@ -292 +294 @@
                 var data = trigger.apply(this, [event, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
 
+                // Put this in the mouseDrag handler since the user can start pressing shift while resizing
+                this._updateVirtualBoundaries(event.shiftKey);
                 if (this._aspectRatio || event.shiftKey)
                         data = this._updateRatio(data, event);
@@ -349 +353 @@
 
         },
+
+    _updateVirtualBoundaries: function(forceAspectRatio) {
+        var o = this.options, pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b;
+
+        b = {
+            minWidth: isNumber(o.minWidth) ? o.minWidth : 0,
+            maxWidth: isNumber(o.maxWidth) ? o.maxWidth : Infinity,
+            minHeight: isNumber(o.minHeight) ? o.minHeight : 0,
+            maxHeight: isNumber(o.maxHeight) ? o.maxHeight : Infinity
+        };
+
+        if(this._aspectRatio || forceAspectRatio) {
+            // We want to create an enclosing box whose aspect ration is the requested one
+            // First, compute the "projected" size for each dimension based on the aspect ratio and other dimension
+            pMinWidth = b.minHeight * this.aspectRatio;
+            pMinHeight = b.minWidth / this.aspectRatio;
+            pMaxWidth = b.maxHeight * this.aspectRatio;
+            pMaxHeight = b.maxWidth / this.aspectRatio;
+
+            if(pMinWidth > b.minWidth) b.minWidth = pMinWidth;
+            if(pMinHeight > b.minHeight) b.minHeight = pMinHeight;
+            if(pMaxWidth < b.maxWidth) b.maxWidth = pMaxWidth;
+            if(pMaxHeight < b.maxHeight) b.maxHeight = pMaxHeight;
+        }
+        this._vBoundaries = b;
+    },
 
         _updateCache: function(data) {
@@ -363 +393 @@
                 var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
 
-                if (data.height) data.width = (csize.height * this.aspectRatio);
-                else if (data.width) data.height = (csize.width / this.aspectRatio);
+                if (isNumber(data.height)) data.width = (data.height * this.aspectRatio);
+                else if (isNumber(data.width)) data.height = (data.width / this.aspectRatio);
 
                 if (a == 'sw') {
@@ -380 +410 @@
         _respectSize: function(data, event) {
 
-                var el = this.helper, o = this.options, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
+                var el = this.helper, o = this._vBoundaries, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
                                 ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
                                         isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height);
@@ -520 +550 @@
 
 $.extend($.ui.resizable, {
-        version: "1.8.10"
+        version: "1.8.16"
 });