aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.effects.scale.js
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-04-02 19:12:21 -0400
committerScott González <scott.gonzalez@gmail.com>2012-04-02 19:12:21 -0400
commit639afa595465f6a1f61e080f2b671af4aac69b4a (patch)
treecab8f18e790d7646677ca0207d21025c9c708428 /ui/jquery.effects.scale.js
parent3e6877a892b8fb70f1130f639dfde09ce5af6236 (diff)
downloadjquery-ui-639afa595465f6a1f61e080f2b671af4aac69b4a.tar.gz
jquery-ui-639afa595465f6a1f61e080f2b671af4aac69b4a.zip
Lint fixes.
Diffstat (limited to 'ui/jquery.effects.scale.js')
-rw-r--r--ui/jquery.effects.scale.js37
1 files changed, 21 insertions, 16 deletions
diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js
index 63b95275c..83b41d3c2 100644
--- a/ui/jquery.effects.scale.js
+++ b/ui/jquery.effects.scale.js
@@ -47,7 +47,8 @@ $.effects.effect.scale = function( o, done ) {
var el = $( this ),
options = $.extend( true, {}, o ),
mode = $.effects.setMode( el, o.mode || "effect" ),
- percent = parseInt( o.percent, 10 ) || ( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode == "hide" ? 0 : 100 ) ),
+ percent = parseInt( o.percent, 10 ) ||
+ ( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
direction = o.direction || "both",
origin = o.origin,
original = {
@@ -57,8 +58,8 @@ $.effects.effect.scale = function( o, done ) {
outerWidth: el.outerWidth()
},
factor = {
- y: direction != "horizontal" ? (percent / 100) : 1,
- x: direction != "vertical" ? (percent / 100) : 1
+ y: direction !== "horizontal" ? (percent / 100) : 1,
+ x: direction !== "vertical" ? (percent / 100) : 1
};
// We are going to pass this effect to the size effect:
@@ -67,12 +68,12 @@ $.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,
width: original.width * factor.x,
@@ -82,11 +83,11 @@ $.effects.effect.scale = function( o, done ) {
// Fade option to support puff
if ( options.fade ) {
- if ( mode == "show" ) {
+ if ( mode === "show" ) {
options.from.opacity = 0;
options.to.opacity = 1;
}
- if ( mode == "hide" ) {
+ if ( mode === "hide" ) {
options.from.opacity = 1;
options.to.opacity = 0;
}
@@ -146,7 +147,7 @@ $.effects.effect.size = function( o, done ) {
};
// Scale the css box
- if ( scale == "box" || scale == "both" ) {
+ if ( scale === "box" || scale === "both" ) {
// Vertical props scaling
if ( factor.from.y !== factor.to.y ) {
@@ -164,7 +165,7 @@ $.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 ) {
@@ -190,7 +191,7 @@ $.effects.effect.size = function( o, done ) {
el.css( el.from ); // set top & left
// Animate
- if ( scale == "content" || scale == "both" ) { // Scale the children
+ if ( scale === "content" || scale === "both" ) { // Scale the children
// Add margins/font-size
vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
@@ -203,8 +204,10 @@ $.effects.effect.size = function( o, done ) {
height: child.height(),
width: child.width()
};
- if (restore) $.effects.save(child, props2);
-
+ if (restore) {
+ $.effects.save(child, props2);
+ }
+
child.from = {
height: c_original.height * factor.from.y,
width: c_original.width * factor.from.x
@@ -215,13 +218,13 @@ $.effects.effect.size = function( o, done ) {
};
// 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 );
}
// Horizontal props scaling
- if ( factor.from.x != factor.to.x ) {
+ if ( factor.from.x !== factor.to.x ) {
child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
}
@@ -231,7 +234,9 @@ $.effects.effect.size = function( o, done ) {
child.animate( child.to, o.duration, o.easing, function() {
// Restore children
- if (restore) $.effects.restore( child, props2 );
+ if ( restore ) {
+ $.effects.restore( child, props2 );
+ }
});
});
}
@@ -245,7 +250,7 @@ $.effects.effect.size = function( o, done ) {
if ( el.to.opacity === 0 ) {
el.css( "opacity", el.from.opacity );
}
- if( mode == "hide" ) {
+ if( mode === "hide" ) {
el.hide();
}
$.effects.restore( el, restore ? props : props1 );