diff options
Diffstat (limited to 'ui/jquery.effects.scale.js')
| -rw-r--r-- | ui/jquery.effects.scale.js | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js index 83b41d3c2..1eedb44eb 100644 --- a/ui/jquery.effects.scale.js +++ b/ui/jquery.effects.scale.js @@ -18,9 +18,9 @@ $.effects.effect.puff = function( o, done ) { hide = mode === "hide", percent = parseInt( o.percent, 10 ) || 150, factor = percent / 100, - original = { - height: elem.height(), - width: elem.width() + original = { + height: elem.height(), + width: elem.width() }; $.extend( o, { @@ -51,8 +51,8 @@ $.effects.effect.scale = function( o, done ) { ( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ), direction = o.direction || "both", origin = o.origin, - original = { - height: el.height(), + original = { + height: el.height(), width: el.width(), outerHeight: el.outerHeight(), outerWidth: el.outerWidth() @@ -60,7 +60,7 @@ $.effects.effect.scale = function( o, done ) { factor = { y: direction !== "horizontal" ? (percent / 100) : 1, x: direction !== "vertical" ? (percent / 100) : 1 - }; + }; // We are going to pass this effect to the size effect: options.effect = "size"; @@ -68,27 +68,27 @@ $.effects.effect.scale = function( o, done ) { options.complete = done; // Set default origin and restore for show/hide - if ( mode !== "effect" ) { + if ( mode !== "effect" ) { options.origin = origin || ["middle","center"]; options.restore = true; } - options.from = o.from || ( mode === "show" ? { height: 0, width: 0 } : original ); + options.from = o.from || ( mode === "show" ? { height: 0, width: 0 } : original ); options.to = { - height: original.height * factor.y, + height: original.height * factor.y, width: original.width * factor.x, - outerHeight: original.outerHeight * factor.y, + outerHeight: original.outerHeight * factor.y, outerWidth: original.outerWidth * factor.x - }; + }; // Fade option to support puff if ( options.fade ) { if ( mode === "show" ) { - options.from.opacity = 0; + options.from.opacity = 0; options.to.opacity = 1; } if ( mode === "hide" ) { - options.from.opacity = 1; + options.from.opacity = 1; options.to.opacity = 0; } } @@ -101,7 +101,7 @@ $.effects.effect.scale = function( o, done ) { $.effects.effect.size = function( o, done ) { // Create element - var el = $( this ), + var el = $( this ), props = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ], // Always restore @@ -125,7 +125,7 @@ $.effects.effect.size = function( o, done ) { el.show(); } original = { - height: el.height(), + height: el.height(), width: el.width(), outerHeight: el.outerHeight(), outerWidth: el.outerWidth() @@ -137,11 +137,11 @@ $.effects.effect.size = function( o, done ) { // Set scaling factor factor = { from: { - y: el.from.height / original.height, + y: el.from.height / original.height, x: el.from.width / original.width }, to: { - y: el.to.height / original.height, + y: el.to.height / original.height, x: el.to.width / original.width } }; @@ -150,14 +150,14 @@ $.effects.effect.size = function( o, done ) { if ( scale === "box" || scale === "both" ) { // Vertical props scaling - if ( factor.from.y !== factor.to.y ) { + if ( factor.from.y !== factor.to.y ) { props = props.concat( vProps ); el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from ); el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to ); } // Horizontal props scaling - if ( factor.from.x !== factor.to.x ) { + if ( factor.from.x !== factor.to.x ) { props = props.concat( hProps ); el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from ); el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to ); @@ -165,20 +165,20 @@ $.effects.effect.size = function( o, done ) { } // Scale the content - if ( scale === "content" || scale === "both" ) { + if ( scale === "content" || scale === "both" ) { // Vertical props scaling - if ( factor.from.y !== factor.to.y ) { + if ( factor.from.y !== factor.to.y ) { props = props.concat( cProps ); el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from ); el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to ); } } - $.effects.save( el, restore ? props : props1 ); - el.show(); + $.effects.save( el, restore ? props : props1 ); + el.show(); $.effects.createWrapper( el ); - el.css( "overflow", "hidden" ).css( el.from ); + el.css( "overflow", "hidden" ).css( el.from ); // Adjust if (origin) { // Calculate baseline shifts @@ -200,8 +200,8 @@ $.effects.effect.size = function( o, done ) { el.find( "*[width]" ).each( function(){ var child = $( this ), - c_original = { - height: child.height(), + c_original = { + height: child.height(), width: child.width() }; if (restore) { @@ -209,16 +209,16 @@ $.effects.effect.size = function( o, done ) { } child.from = { - height: c_original.height * factor.from.y, + height: c_original.height * factor.from.y, width: c_original.width * factor.from.x }; child.to = { - height: c_original.height * factor.to.y, + height: c_original.height * factor.to.y, width: c_original.width * factor.to.x }; // Vertical props scaling - if ( factor.from.y !== factor.to.y ) { + if ( factor.from.y !== factor.to.y ) { child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from ); child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to ); } @@ -242,10 +242,10 @@ $.effects.effect.size = function( o, done ) { } // Animate - el.animate( el.to, { - queue: false, - duration: o.duration, - easing: o.easing, + el.animate( el.to, { + queue: false, + duration: o.duration, + easing: o.easing, complete: function() { if ( el.to.opacity === 0 ) { el.css( "opacity", el.from.opacity ); @@ -277,7 +277,7 @@ $.effects.effect.size = function( o, done ) { return toRef + "px"; } - return val + toRef + "px"; + return val + toRef + "px"; }); }); } |