Changeset 20824 for trunk/themes/default/js/ui/jquery.ui.effect-scale.js

Timestamp:

Feb 18, 2013, 10:18:40 PM (11 years ago)

Author:

rvelices

Message:

upgraded jquery ui from 1.9.0 to 1.10.1

File:

• trunk/themes/default/js/ui/jquery.ui.effect-scale.js (modified) (13 diffs)

trunk/themes/default/js/ui/jquery.ui.effect-scale.js

@@ -1 +1 @@
 /*!
- * jQuery UI Effects Scale 1.9.0
+ * jQuery UI Effects Scale 1.10.1
  * http://jqueryui.com
  *
- * Copyright 2012 jQuery Foundation and other contributors
+ * Copyright 2013 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
@@ -22 +22 @@
                 original = {
                         height: elem.height(),
-                        width: elem.width()
+                        width: elem.width(),
+                        outerHeight: elem.outerHeight(),
+                        outerWidth: elem.outerWidth()
                 };
 
@@ -36 +38 @@
                         {
                                 height: original.height * factor,
-                                width: original.width * factor
+                                width: original.width * factor,
+                                outerHeight: original.outerHeight * factor,
+                                outerWidth: original.outerWidth * factor
                         }
         });
@@ -75 +79 @@
         }
 
-        options.from = o.from || ( mode === "show" ? { height: 0, width: 0 } : original );
+        options.from = o.from || ( mode === "show" ? {
+                height: 0,
+                width: 0,
+                outerHeight: 0,
+                outerWidth: 0
+        } : original );
         options.to = {
                 height: original.height * factor.y,
@@ -103 +112 @@
 
         // Create element
-        var el = $( this ),
-                props = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
+        var original, baseline, factor,
+                el = $( this ),
+                props0 = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
 
                 // Always restore
@@ -120 +130 @@
                 scale = o.scale || "both",
                 origin = o.origin || [ "middle", "center" ],
-                original, baseline, factor,
-                position = el.css( "position" );
+                position = el.css( "position" ),
+                props = restore ? props0 : props1,
+                zero = {
+                        height: 0,
+                        width: 0,
+                        outerHeight: 0,
+                        outerWidth: 0
+                };
 
         if ( mode === "show" ) {
@@ -133 +149 @@
         };
 
-        el.from = o.from || original;
-        el.to = o.to || original;
+        if ( o.mode === "toggle" && mode === "show" ) {
+                el.from = o.to || zero;
+                el.to = o.from || original;
+        } else {
+                el.from = o.from || ( mode === "show" ? zero : original );
+                el.to = o.to || ( mode === "hide" ? zero : original );
+        }
 
         // Set scaling factor
@@ -171 +192 @@
                 // Vertical props scaling
                 if ( factor.from.y !== factor.to.y ) {
-                        props = props.concat( cProps );
+                        props = props.concat( cProps ).concat( props2 );
                         el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
                         el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
@@ -177 +198 @@
         }
 
-        $.effects.save( el, restore ? props : props1 );
+        $.effects.save( el, props );
         el.show();
         $.effects.createWrapper( el );
@@ -198 +219 @@
                 vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
                 hProps = hProps.concat([ "marginLeft", "marginRight" ]);
-                props2 = props.concat(vProps).concat(hProps);
+                props2 = props0.concat(vProps).concat(hProps);
 
                 el.find( "*[width]" ).each( function(){
@@ -204 +225 @@
                                 c_original = {
                                         height: child.height(),
-                                        width: child.width()
+                                        width: child.width(),
+                                        outerHeight: child.outerHeight(),
+                                        outerWidth: child.outerWidth()
                                 };
                         if (restore) {
@@ -212 +235 @@
                         child.from = {
                                 height: c_original.height * factor.from.y,
-                                width: c_original.width * factor.from.x
+                                width: c_original.width * factor.from.x,
+                                outerHeight: c_original.outerHeight * factor.from.y,
+                                outerWidth: c_original.outerWidth * factor.from.x
                         };
                         child.to = {
                                 height: c_original.height * factor.to.y,
-                                width: c_original.width * factor.to.x
+                                width: c_original.width * factor.to.x,
+                                outerHeight: c_original.height * factor.to.y,
+                                outerWidth: c_original.width * factor.to.x
                         };
 
@@ -255 +282 @@
                                 el.hide();
                         }
-                        $.effects.restore( el, restore ? props : props1 );
+                        $.effects.restore( el, props );
                         if ( !restore ) {