aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2015-03-18 15:39:12 +0100
committerJörn Zaefferer <joern.zaefferer@gmail.com>2015-03-18 15:42:55 +0100
commit868e8c70e391b5ba886edc93fdec28086a6a3fca (patch)
tree16bbe1c88854f12d094ca026d32a00fc9d832ff3
parentc16a5e58f9e4c130d15e86898e62707c43877ab4 (diff)
downloadjquery-ui-868e8c70e391b5ba886edc93fdec28086a6a3fca.tar.gz
jquery-ui-868e8c70e391b5ba886edc93fdec28086a6a3fca.zip
Effects: Fix style issues in individual effects
Skipping ui/effect.js since embedded jquery-color has many issues. Closes gh-1510
-rw-r--r--Gruntfile.js2
-rw-r--r--ui/effect-blind.js12
-rw-r--r--ui/effect-bounce.js10
-rw-r--r--ui/effect-clip.js12
-rw-r--r--ui/effect-drop.js12
-rw-r--r--ui/effect-explode.js59
-rw-r--r--ui/effect-fade.js14
-rw-r--r--ui/effect-fold.js14
-rw-r--r--ui/effect-highlight.js16
-rw-r--r--ui/effect-puff.js12
-rw-r--r--ui/effect-pulsate.js10
-rw-r--r--ui/effect-scale.js10
-rw-r--r--ui/effect-shake.js10
-rw-r--r--ui/effect-size.js20
-rw-r--r--ui/effect-slide.js12
-rw-r--r--ui/effect-transfer.js10
16 files changed, 118 insertions, 117 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 5cc640b73..f69aed06a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -83,7 +83,7 @@ var
"ui/datepicker.js",
"ui/draggable.js",
"ui/droppable.js",
- "ui/effect*.js",
+ "ui/effect.js",
"ui/mouse.js",
"ui/resizable.js",
"ui/selectable.js",
diff --git a/ui/effect-blind.js b/ui/effect-blind.js
index 291c309e5..45358d759 100644
--- a/ui/effect-blind.js
+++ b/ui/effect-blind.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/blind-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "blind", "hide", function( options, done ) {
var map = {
@@ -63,7 +63,7 @@ return $.effects.define( "blind", "hide", function( options, done ) {
duration: options.duration,
easing: options.easing,
complete: done
- });
-});
+ } );
+} );
-}));
+} ) );
diff --git a/ui/effect-bounce.js b/ui/effect-bounce.js
index 197acda5e..8a5d58e30 100644
--- a/ui/effect-bounce.js
+++ b/ui/effect-bounce.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/bounce-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "bounce", function( options, done ) {
var upAnim, downAnim, refValue,
@@ -103,6 +103,6 @@ return $.effects.define( "bounce", function( options, done ) {
element.queue( done );
$.effects.unshift( element, queuelen, anims + 1 );
-});
+} );
-}));
+} ) );
diff --git a/ui/effect-clip.js b/ui/effect-clip.js
index 534df6028..4eb24eb88 100644
--- a/ui/effect-clip.js
+++ b/ui/effect-clip.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/clip-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "clip", "hide", function( options, done ) {
var start,
@@ -57,8 +57,8 @@ return $.effects.define( "clip", "hide", function( options, done ) {
duration: options.duration,
easing: options.easing,
complete: done
- });
+ } );
-});
+} );
-}));
+} ) );
diff --git a/ui/effect-drop.js b/ui/effect-drop.js
index 2afad399b..3ad90caa6 100644
--- a/ui/effect-drop.js
+++ b/ui/effect-drop.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/drop-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "drop", "hide", function( options, done ) {
@@ -61,7 +61,7 @@ return $.effects.define( "drop", "hide", function( options, done ) {
duration: options.duration,
easing: options.easing,
complete: done
- });
-});
+ } );
+} );
-}));
+} ) );
diff --git a/ui/effect-explode.js b/ui/effect-explode.js
index c1145b0b3..3e468675a 100644
--- a/ui/effect-explode.js
+++ b/ui/effect-explode.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/explode-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "explode", "hide", function( options, done ) {
@@ -54,13 +54,13 @@ return $.effects.define( "explode", "hide", function( options, done ) {
}
// clone the element for each row and cell.
- for ( i = 0; i < rows ; i++ ) { // ===>
+ for ( i = 0; i < rows; i++ ) { // ===>
top = offset.top + i * height;
- my = i - ( rows - 1 ) / 2 ;
+ my = i - ( rows - 1 ) / 2;
- for ( j = 0; j < cells ; j++ ) { // |||
+ for ( j = 0; j < cells; j++ ) { // |||
left = offset.left + j * width;
- mx = j - ( cells - 1 ) / 2 ;
+ mx = j - ( cells - 1 ) / 2;
// Create a clone of the now hidden main element that will be absolute positioned
// within a wrapper div off the -left and -top equal to size of our pieces
@@ -68,40 +68,41 @@ return $.effects.define( "explode", "hide", function( options, done ) {
.clone()
.appendTo( "body" )
.wrap( "<div></div>" )
- .css({
+ .css( {
position: "absolute",
visibility: "visible",
left: -j * width,
top: -i * height
- })
+ } )
- // select the wrapper - make it overflow: hidden and absolute positioned based on
- // where the original was located +left and +top equal to the size of pieces
+ // select the wrapper - make it overflow: hidden and absolute positioned based on
+ // where the original was located +left and +top equal to the size of pieces
.parent()
- .addClass( "ui-effects-explode" )
- .css({
- position: "absolute",
- overflow: "hidden",
- width: width,
- height: height,
- left: left + ( show ? mx * width : 0 ),
- top: top + ( show ? my * height : 0 ),
- opacity: show ? 0 : 1
- }).animate({
- left: left + ( show ? 0 : mx * width ),
- top: top + ( show ? 0 : my * height ),
- opacity: show ? 1 : 0
- }, options.duration || 500, options.easing, childComplete );
+ .addClass( "ui-effects-explode" )
+ .css( {
+ position: "absolute",
+ overflow: "hidden",
+ width: width,
+ height: height,
+ left: left + ( show ? mx * width : 0 ),
+ top: top + ( show ? my * height : 0 ),
+ opacity: show ? 0 : 1
+ } )
+ .animate( {
+ left: left + ( show ? 0 : mx * width ),
+ top: top + ( show ? 0 : my * height ),
+ opacity: show ? 1 : 0
+ }, options.duration || 500, options.easing, childComplete );
}
}
function animComplete() {
- element.css({
+ element.css( {
visibility: "visible"
- });
+ } );
$( pieces ).remove();
done();
}
-});
+} );
-}));
+} ) );
diff --git a/ui/effect-fade.js b/ui/effect-fade.js
index aba0ad482..ecc44722a 100644
--- a/ui/effect-fade.js
+++ b/ui/effect-fade.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/fade-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,21 +26,21 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "fade", "toggle", function( options, done ) {
var show = options.mode === "show";
$( this )
.css( "opacity", show ? 0 : 1 )
- .animate({
+ .animate( {
opacity: show ? 1 : 0
}, {
queue: false,
duration: options.duration,
easing: options.easing,
complete: done
- });
-});
+ } );
+} );
-}));
+} ) );
diff --git a/ui/effect-fold.js b/ui/effect-fold.js
index 3af1dd602..a61eef0ab 100644
--- a/ui/effect-fold.js
+++ b/ui/effect-fold.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/fold-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "fold", "hide", function( options, done ) {
@@ -69,7 +69,7 @@ return $.effects.define( "fold", "hide", function( options, done ) {
// Animate
element
- .queue(function( next ) {
+ .queue( function( next ) {
if ( placeholder ) {
placeholder
.animate( $.effects.clipToBox( animation1 ), duration, options.easing )
@@ -77,12 +77,12 @@ return $.effects.define( "fold", "hide", function( options, done ) {
}
next();
- })
+ } )
.animate( animation1, duration, options.easing )
.animate( animation2, duration, options.easing )
.queue( done );
$.effects.unshift( element, queuelen, 4 );
-});
+} );
-}));
+} ) );
diff --git a/ui/effect-highlight.js b/ui/effect-highlight.js
index da3f82b72..721a3a05b 100644
--- a/ui/effect-highlight.js
+++ b/ui/effect-highlight.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/highlight-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "highlight", "show", function( options, done ) {
var element = $( this ),
@@ -41,16 +41,16 @@ return $.effects.define( "highlight", "show", function( options, done ) {
$.effects.saveStyle( element );
element
- .css({
+ .css( {
backgroundImage: "none",
backgroundColor: options.color || "#ffff99"
- })
+ } )
.animate( animation, {
queue: false,
duration: options.duration,
easing: options.easing,
complete: done
- });
-});
+ } );
+} );
-}));
+} ) );
diff --git a/ui/effect-puff.js b/ui/effect-puff.js
index a90174c25..ac3f90a64 100644
--- a/ui/effect-puff.js
+++ b/ui/effect-puff.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/puff-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect",
"./effect-scale"
@@ -27,15 +27,15 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "puff", "hide", function( options, done ) {
var newOptions = $.extend( true, {}, options, {
fade: true,
percent: parseInt( options.percent, 10 ) || 150
- });
+ } );
$.effects.effect.scale.call( this, newOptions, done );
-});
+} );
-}));
+} ) );
diff --git a/ui/effect-pulsate.js b/ui/effect-pulsate.js
index 95cf811a6..f6f46da76 100644
--- a/ui/effect-pulsate.js
+++ b/ui/effect-pulsate.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/pulsate-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "pulsate", "show", function( options, done ) {
var element = $( this ),
@@ -58,6 +58,6 @@ return $.effects.define( "pulsate", "show", function( options, done ) {
element.queue( done );
$.effects.unshift( element, queuelen, anims + 1 );
-});
+} );
-}));
+} ) );
diff --git a/ui/effect-scale.js b/ui/effect-scale.js
index 18e6960c1..5d76ac166 100644
--- a/ui/effect-scale.js
+++ b/ui/effect-scale.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/scale-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect",
"./effect-size"
@@ -27,7 +27,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "scale", function( options, done ) {
@@ -50,6 +50,6 @@ return $.effects.define( "scale", function( options, done ) {
}
$.effects.effect.size.call( this, newOptions, done );
-});
+} );
-}));
+} ) );
diff --git a/ui/effect-shake.js b/ui/effect-shake.js
index a94503f29..52240fed0 100644
--- a/ui/effect-shake.js
+++ b/ui/effect-shake.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/shake-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "shake", function( options, done ) {
@@ -66,6 +66,6 @@ return $.effects.define( "shake", function( options, done ) {
.queue( done );
$.effects.unshift( element, queuelen, anims + 1 );
-});
+} );
-}));
+} ) );
diff --git a/ui/effect-size.js b/ui/effect-size.js
index 3be3984b6..16a2adac1 100644
--- a/ui/effect-size.js
+++ b/ui/effect-size.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/size-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "size", function( options, done ) {
@@ -109,8 +109,8 @@ return $.effects.define( "size", function( options, done ) {
// Animate the children if desired
if ( scale === "content" || scale === "both" ) {
- vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat( cProps );
- hProps = hProps.concat([ "marginLeft", "marginRight" ]);
+ vProps = vProps.concat( [ "marginTop", "marginBottom" ] ).concat( cProps );
+ hProps = hProps.concat( [ "marginLeft", "marginRight" ] );
// Only animate children with width attributes specified
// TODO: is this right? should we include anything with css width specified as well
@@ -154,8 +154,8 @@ return $.effects.define( "size", function( options, done ) {
if ( restore ) {
$.effects.restoreStyle( child );
}
- });
- });
+ } );
+ } );
}
// Animate
@@ -183,8 +183,8 @@ return $.effects.define( "size", function( options, done ) {
done();
}
- });
+ } );
-});
+} );
-}));
+} ) );
diff --git a/ui/effect-slide.js b/ui/effect-slide.js
index b6626cbb8..1f4013058 100644
--- a/ui/effect-slide.js
+++ b/ui/effect-slide.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/slide-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,7 +26,7 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
return $.effects.define( "slide", "show", function( options, done ) {
var startClip, startRef,
@@ -68,7 +68,7 @@ return $.effects.define( "slide", "show", function( options, done ) {
duration: options.duration,
easing: options.easing,
complete: done
- });
-});
+ } );
+} );
-}));
+} ) );
diff --git a/ui/effect-transfer.js b/ui/effect-transfer.js
index b0bc42886..41208b9e6 100644
--- a/ui/effect-transfer.js
+++ b/ui/effect-transfer.js
@@ -13,11 +13,11 @@
//>>docs: http://api.jqueryui.com/transfer-effect/
//>>demos: http://jqueryui.com/effect/
-(function( factory ) {
+( function( factory ) {
if ( typeof define === "function" && define.amd ) {
// AMD. Register as an anonymous module.
- define([
+ define( [
"jquery",
"./effect"
], factory );
@@ -26,12 +26,12 @@
// Browser globals
factory( jQuery );
}
-}(function( $ ) {
+}( function( $ ) {
if ( $.uiBackCompat !== false ) {
return $.effects.define( "transfer", function( options, done ) {
$( this ).transfer( options, done );
- });
+ } );
}
-}));
+} ) );