From 01f7f3c5fd45cc8fc4fd2ec28b668080c8cc8aa7 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Wed, 12 Feb 2014 15:54:09 -0800
Subject: [PATCH 08/40] Effects Rewrite: No longer swap "to" and "from" in
scale.
This is now always handled by effect-size.
---
ui/effect-scale.js | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/ui/effect-scale.js b/ui/effect-scale.js
index 6cfc555b0b9..071e03ac3fe 100644
--- a/ui/effect-scale.js
+++ b/ui/effect-scale.js
@@ -32,8 +32,7 @@
$.effects.define( "scale", function( o, done ) {
// Create element
- var temp,
- el = $( this ),
+ var el = $( this ),
mode = o.mode,
// this copies the "scale" option, which is normalized in $.effects.effect.size
@@ -73,12 +72,6 @@ $.effects.define( "scale", function( o, done ) {
}
}
- if ( mode === "show" ) {
- temp = options.from;
- options.from = options.to;
- options.to = temp;
- }
-
$.effects.effect.size.call( this, options, done );
});
From 902996393115e415e6d1ed266aa20cc17f864fd0 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Wed, 12 Feb 2014 17:08:43 -0800
Subject: [PATCH 09/40] Effects rewrite: correct "restore: false" use case for
size/scale.
This makes all tests pass in test suite. Wooh!
---
ui/effect-size.js | 31 +++++++------------------------
1 file changed, 7 insertions(+), 24 deletions(-)
diff --git a/ui/effect-size.js b/ui/effect-size.js
index 05ca2499a35..de7864c32d3 100644
--- a/ui/effect-size.js
+++ b/ui/effect-size.js
@@ -182,6 +182,8 @@ $.effects.define( "size", function( o, done ) {
easing: o.easing,
complete: function() {
+ var offset = el.offset();
+
if ( restore ) {
$.effects.removePlaceholder( placeholder, el );
}
@@ -195,32 +197,13 @@ $.effects.define( "size", function( o, done ) {
if ( !restore ) {
- // we need to calculate our new positioning based on the scaling
- if ( position === "static" ) {
- el.css({
- position: "relative",
- top: to.top,
- left: to.left
- });
- } else {
- $.each([ "top", "left" ], function( idx, pos ) {
- el.css( pos, function( _, str ) {
- var val = parseInt( str, 10 ),
- toRef = idx ? to.left : to.top;
-
- // if original was "auto", recalculate the new value from placeholder
- if ( str === "auto" ) {
- return toRef + "px";
- }
-
- return val + toRef + "px";
- });
- });
+ if ( placeholder ) {
+ placeholder.remove();
}
- // the placeholder needs to be removed only after the new position is set
- // as it's relied upon for correcting "auto" above
- $.effects.removePlaceholder( placeholder, el );
+ el.css("position", position === "static" ? "relative" : position );
+
+ el.offset(offset);
}
done();
From d56459005e581571d1e54617cf68d0af2c283bc8 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Fri, 28 Feb 2014 19:56:57 -0500
Subject: [PATCH 10/40] Effects: Allow all "effect" calls to default to default
Mode.
This fixes the situation where calling e.g. .effect("highlight")
was a no-op as if .show("highlight") was called.
---
ui/effect.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/effect.js b/ui/effect.js
index 749e6351de6..87b7f18d17f 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1265,7 +1265,7 @@ $.fn.extend({
effectPrefilter = function() {
var el = $( this ),
- normalizedMode = $.effects.mode( el, mode );
+ normalizedMode = $.effects.mode( el, mode ) || defaultMode;
// save effect mode for later use,
// we can't just call $.effects.mode again later,
@@ -1284,7 +1284,7 @@ $.fn.extend({
},
queue = args.queue,
complete = args.complete,
- mode = args.mode || defaultMode;
+ mode = args.mode;
if ( $.fx.off || !effectMethod ) {
// delegate to the original method (e.g., .show()) if possible
From 1cae0d3ea2c862e78ff9318a3e538515991cef66 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Mon, 3 Mar 2014 08:23:14 -0500
Subject: [PATCH 11/40] Size Effect: revert default origin to middle, center.
---
ui/effect-size.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/effect-size.js b/ui/effect-size.js
index de7864c32d3..9ef9dabe489 100644
--- a/ui/effect-size.js
+++ b/ui/effect-size.js
@@ -43,7 +43,7 @@ $.effects.define( "size", function( o, done ) {
mode = o.mode,
restore = o.restore || mode !== "effect",
scale = o.scale || "both",
- origin = o.origin || [ "top", "left" ],
+ origin = o.origin || [ "middle", "center" ],
position = el.css( "position" ),
pos = el.position(),
zero = {
From fb390564412645229315273b54f5611e7e657770 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Mon, 3 Mar 2014 08:35:56 -0500
Subject: [PATCH 12/40] Puff Effect: set default effect mode to hide
---
ui/effect-puff.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/effect-puff.js b/ui/effect-puff.js
index 0a586c62898..d8c324f4e3e 100644
--- a/ui/effect-puff.js
+++ b/ui/effect-puff.js
@@ -29,7 +29,7 @@
}
}(function( $ ) {
-$.effects.define( "puff", function( o, done ) {
+$.effects.define( "puff", "hide", function( o, done ) {
var options = $.extend( true, {}, o, {
fade: true,
percent: parseInt( o.percent, 10 ) || 150
From 2f25d1fc11c4538838c25a2c4caefb0f0061b2ea Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Wed, 3 Sep 2014 15:34:54 -0400
Subject: [PATCH 13/40] Effects: Calling an effect that hides back to back
replays animation
---
ui/effect.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/effect.js b/ui/effect.js
index 87b7f18d17f..15a341c5a65 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1276,7 +1276,8 @@ $.fn.extend({
return;
}
- if ( normalizedMode === "show" ) {
+ if ( normalizedMode === "show" ||
+ ( normalizedMode === defaultMode && normalizedMode === "hide" ) ) {
el.show();
}
From e02ec9d0d683c689578efe20d54c05f20c5bb42e Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Fri, 12 Sep 2014 11:36:54 -0500
Subject: [PATCH 14/40] Effects: rename effect.removePlaceholder to
effect.cleanUpPlaceholder
---
ui/effect-blind.js | 2 +-
ui/effect-bounce.js | 2 +-
ui/effect-clip.js | 2 +-
ui/effect-drop.js | 2 +-
ui/effect-fold.js | 2 +-
ui/effect-shake.js | 3 ++-
ui/effect-size.js | 7 ++-----
ui/effect-slide.js | 2 +-
ui/effect.js | 13 ++++++++-----
9 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/ui/effect-blind.js b/ui/effect-blind.js
index e940089b50b..fe3ed68c025 100644
--- a/ui/effect-blind.js
+++ b/ui/effect-blind.js
@@ -60,7 +60,7 @@ $.effects.define( "blind", "hide", function( o, done ) {
easing: o.easing,
complete: function() {
- $.effects.removePlaceholder( placeholder, el );
+ $.effects.cleanUpPlaceholder( placeholder, el );
if ( !show ) {
el.hide();
diff --git a/ui/effect-bounce.js b/ui/effect-bounce.js
index 016191aff6d..6e50a448e41 100644
--- a/ui/effect-bounce.js
+++ b/ui/effect-bounce.js
@@ -100,7 +100,7 @@ $.effects.define( "bounce", function( o, done ) {
}
el.queue(function() {
- $.effects.removePlaceholder( placeholder, el );
+ $.effects.cleanUpPlaceholder( placeholder, el );
if ( hide ) {
el.hide();
diff --git a/ui/effect-clip.js b/ui/effect-clip.js
index c3d8ae25cb3..5fec670ede0 100644
--- a/ui/effect-clip.js
+++ b/ui/effect-clip.js
@@ -59,7 +59,7 @@ $.effects.define( "clip", "hide", function( o, done ) {
easing: o.easing,
complete: function() {
- $.effects.removePlaceholder( placeholder, el );
+ $.effects.cleanUpPlaceholder( placeholder, el );
if ( !show ) {
el.hide();
diff --git a/ui/effect-drop.js b/ui/effect-drop.js
index 5c359ef47c5..1eb274d0cc4 100644
--- a/ui/effect-drop.js
+++ b/ui/effect-drop.js
@@ -60,7 +60,7 @@ $.effects.define( "drop", "hide", function( o, done ) {
duration: o.duration,
easing: o.easing,
complete: function() {
- $.effects.removePlaceholder( placeholder, el );
+ $.effects.cleanUpPlaceholder( placeholder, el );
if ( mode === "hide" ) {
el.hide();
diff --git a/ui/effect-fold.js b/ui/effect-fold.js
index 7d5b70f6614..a3a9ab15ea8 100644
--- a/ui/effect-fold.js
+++ b/ui/effect-fold.js
@@ -75,7 +75,7 @@ $.effects.define( "fold", "hide", function( o, done ) {
.animate( animation1, duration, o.easing )
.animate( animation2, duration, o.easing )
.queue(function() {
- $.effects.removePlaceholder( placeholder, el );
+ $.effects.cleanUpPlaceholder( placeholder, el );
if ( hide ) {
el.hide();
diff --git a/ui/effect-shake.js b/ui/effect-shake.js
index cbfdcf6d4f9..7d34351b96b 100644
--- a/ui/effect-shake.js
+++ b/ui/effect-shake.js
@@ -59,12 +59,13 @@ $.effects.define( "shake", function( o, done ) {
for ( ; i < times; i++ ) {
el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
}
+
el
.animate( animation1, speed, o.easing )
.animate( animation, speed / 2, o.easing )
.queue(function() {
- $.effects.removePlaceholder( placeholder, el );
+ $.effects.cleanUpPlaceholder( placeholder, el );
if ( o.mode === "hide" ) {
el.hide();
diff --git a/ui/effect-size.js b/ui/effect-size.js
index 9ef9dabe489..6a2cbb4f7da 100644
--- a/ui/effect-size.js
+++ b/ui/effect-size.js
@@ -185,7 +185,7 @@ $.effects.define( "size", function( o, done ) {
var offset = el.offset();
if ( restore ) {
- $.effects.removePlaceholder( placeholder, el );
+ $.effects.cleanUpPlaceholder( placeholder, el );
}
if ( to.opacity === 0 ) {
@@ -196,10 +196,7 @@ $.effects.define( "size", function( o, done ) {
}
if ( !restore ) {
-
- if ( placeholder ) {
- placeholder.remove();
- }
+ $.effects.removePlaceholder( placeholder );
el.css("position", position === "static" ? "relative" : position );
diff --git a/ui/effect-slide.js b/ui/effect-slide.js
index 85901888caf..26bd91d2410 100644
--- a/ui/effect-slide.js
+++ b/ui/effect-slide.js
@@ -65,7 +65,7 @@ $.effects.define( "slide", "show", function( o, done ) {
duration: o.duration,
easing: o.easing,
complete: function() {
- $.effects.removePlaceholder( placeholder, el );
+ $.effects.cleanUpPlaceholder( placeholder, el );
if ( mode === "hide" ) {
el.hide();
diff --git a/ui/effect.js b/ui/effect.js
index 15a341c5a65..51fef8d96ff 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1156,16 +1156,19 @@ $.extend( $.effects, {
return placeholder;
},
- // removes a placeholder if it exists and restores
- // properties that were modified during placeholder creation
- removePlaceholder: function( placeholder, el ) {
- $.effects.restoreStyle( el );
-
+ removePlaceholder: function( placeholder ) {
if ( placeholder ) {
placeholder.remove();
}
},
+ // removes a placeholder if it exists and restores
+ // properties that were modified during placeholder creation
+ cleanUpPlaceholder: function( placeholder, el ) {
+ $.effects.restoreStyle( el );
+ $.effects.removePlaceholder( placeholder );
+ },
+
setTransition: function( element, list, factor, value ) {
value = value || {};
$.each( list, function( i, x ) {
From cc786a8937088dc63a50c9f475a46992f60edad2 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Fri, 12 Sep 2014 12:03:36 -0500
Subject: [PATCH 15/40] Effects: Remove stored style data when calling
removeStyle
---
ui/effect.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui/effect.js b/ui/effect.js
index 51fef8d96ff..7966241548a 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -26,6 +26,7 @@
}(function( $ ) {
var dataSpace = "ui-effects-",
+ dataSpaceStyle = "ui-effects-style",
// Create a local jQuery because jQuery Color relies on it and the
// global may not exist with AMD and a custom build (#10199)
@@ -1053,11 +1054,12 @@ $.extend( $.effects, {
},
saveStyle: function( element ) {
- element.data( dataSpace + "style", element[ 0 ].style.cssText );
+ element.data( dataSpaceStyle, element[ 0 ].style.cssText );
},
restoreStyle: function( element ) {
- element[ 0 ].style.cssText = element.data( dataSpace + "style" ) || "";
+ element[ 0 ].style.cssText = element.data( dataSpaceStyle ) || "";
+ element.removeData( dataSpaceStyle );
},
mode: function( el, mode ) {
From dbb6540d60ba232967a1ed867c6f21459f8e09dd Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Fri, 12 Sep 2014 14:58:30 -0500
Subject: [PATCH 16/40] Effects: Introduce $.fn.transfer, deprecate
$.effects.effect.transfer
---
ui/effect-transfer.js | 35 +++++------------------------------
ui/effect.js | 31 +++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/ui/effect-transfer.js b/ui/effect-transfer.js
index e3cdb2ad210..02b34d26b65 100644
--- a/ui/effect-transfer.js
+++ b/ui/effect-transfer.js
@@ -28,35 +28,10 @@
}
}(function( $ ) {
-$.effects.define( "transfer", function( o, done ) {
- var elem = $( this ),
- target = $( o.to ),
- targetFixed = target.css("position") === "fixed",
- body = $("body"),
- fixTop = targetFixed ? body.scrollTop() : 0,
- fixLeft = targetFixed ? body.scrollLeft() : 0,
- endPosition = target.offset(),
- animation = {
- top: endPosition.top - fixTop,
- left: endPosition.left - fixLeft,
- height: target.innerHeight(),
- width: target.innerWidth()
- },
- startPosition = elem.offset(),
- transfer = $("")
- .appendTo("body")
- .addClass( o.className )
- .css({
- top: startPosition.top - fixTop,
- left: startPosition.left - fixLeft,
- height: elem.innerHeight(),
- width: elem.innerWidth(),
- position: targetFixed ? "fixed" : "absolute"
- })
- .animate( animation, o.duration, o.easing, function() {
- transfer.remove();
- done();
- });
-});
+if ( $.uiBackCompat !== false ) {
+ $.effects.define( "transfer", function( options, done ) {
+ $( this ).transfer( options, done );
+ });
+}
}));
diff --git a/ui/effect.js b/ui/effect.js
index 7966241548a..18d083c7ba9 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1396,6 +1396,37 @@ $.fn.extend({
return clipObj ?
this.css( "clip", "rect(" + clipObj.top + "px " + clipObj.right + "px " + clipObj.bottom + "px " + clipObj.left + "px)" ) :
parseClip( this.css("clip"), this );
+ },
+
+ transfer: function( options, done ) {
+ var element = $( this ),
+ target = $( options.to ),
+ targetFixed = target.css( "position" ) === "fixed",
+ body = $( "body" ),
+ fixTop = targetFixed ? body.scrollTop() : 0,
+ fixLeft = targetFixed ? body.scrollLeft() : 0,
+ endPosition = target.offset(),
+ animation = {
+ top: endPosition.top - fixTop,
+ left: endPosition.left - fixLeft,
+ height: target.innerHeight(),
+ width: target.innerWidth()
+ },
+ startPosition = element.offset(),
+ transfer = $( "" )
+ .appendTo( "body" )
+ .addClass( options.className )
+ .css({
+ top: startPosition.top - fixTop,
+ left: startPosition.left - fixLeft,
+ height: element.innerHeight(),
+ width: element.innerWidth(),
+ position: targetFixed ? "fixed" : "absolute"
+ })
+ .animate( animation, options.duration, options.easing, function() {
+ transfer.remove();
+ done();
+ });
}
});
From 85ce536fae5aac4a54a99af022b60e70fd404747 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Fri, 12 Sep 2014 15:10:22 -0500
Subject: [PATCH 17/40] Effects: Ensure defined effects are exported as modules
---
ui/effect-blind.js | 2 +-
ui/effect-bounce.js | 2 +-
ui/effect-clip.js | 2 +-
ui/effect-drop.js | 2 +-
ui/effect-explode.js | 2 +-
ui/effect-fade.js | 2 +-
ui/effect-fold.js | 2 +-
ui/effect-highlight.js | 2 +-
ui/effect-puff.js | 2 +-
ui/effect-pulsate.js | 2 +-
ui/effect-scale.js | 2 +-
ui/effect-shake.js | 2 +-
ui/effect-size.js | 2 +-
ui/effect-slide.js | 2 +-
ui/effect-transfer.js | 2 +-
ui/effect.js | 2 ++
16 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/ui/effect-blind.js b/ui/effect-blind.js
index fe3ed68c025..423ebc86152 100644
--- a/ui/effect-blind.js
+++ b/ui/effect-blind.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "blind", "hide", function( o, done ) {
+return $.effects.define( "blind", "hide", function( o, done ) {
var start, placeholder,
animate = {},
map = {
diff --git a/ui/effect-bounce.js b/ui/effect-bounce.js
index 6e50a448e41..d921dfc1907 100644
--- a/ui/effect-bounce.js
+++ b/ui/effect-bounce.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "bounce", function( o, done ) {
+return $.effects.define( "bounce", function( o, done ) {
var upAnim, downAnim,
el = $( this ),
diff --git a/ui/effect-clip.js b/ui/effect-clip.js
index 5fec670ede0..2e51ed4108b 100644
--- a/ui/effect-clip.js
+++ b/ui/effect-clip.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "clip", "hide", function( o, done ) {
+return $.effects.define( "clip", "hide", function( o, done ) {
var start, placeholder,
animate = {},
el = $( this ),
diff --git a/ui/effect-drop.js b/ui/effect-drop.js
index 1eb274d0cc4..c923374cc35 100644
--- a/ui/effect-drop.js
+++ b/ui/effect-drop.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "drop", "hide", function( o, done ) {
+return $.effects.define( "drop", "hide", function( o, done ) {
var el = $( this ),
mode = o.mode,
diff --git a/ui/effect-explode.js b/ui/effect-explode.js
index c7fde4e3c6b..56f8fe375f4 100644
--- a/ui/effect-explode.js
+++ b/ui/effect-explode.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "explode", "hide", function( o, done ) {
+return $.effects.define( "explode", "hide", function( o, done ) {
var i, j, left, top, mx, my,
rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
diff --git a/ui/effect-fade.js b/ui/effect-fade.js
index b86ac3582b0..bb94eee2221 100644
--- a/ui/effect-fade.js
+++ b/ui/effect-fade.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "fade", "toggle", function( o, done ) {
+return $.effects.define( "fade", "toggle", function( o, done ) {
$( this ).animate({
opacity: o.mode
}, {
diff --git a/ui/effect-fold.js b/ui/effect-fold.js
index a3a9ab15ea8..aebf5f72894 100644
--- a/ui/effect-fold.js
+++ b/ui/effect-fold.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "fold", "hide", function( o, done ) {
+return $.effects.define( "fold", "hide", function( o, done ) {
// Create element
var el = $( this ),
diff --git a/ui/effect-highlight.js b/ui/effect-highlight.js
index 8d5fafef7b5..e8199355ecc 100644
--- a/ui/effect-highlight.js
+++ b/ui/effect-highlight.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "highlight", "show", function( o, done ) {
+return $.effects.define( "highlight", "show", function( o, done ) {
var elem = $( this ),
mode = o.mode,
animation = {
diff --git a/ui/effect-puff.js b/ui/effect-puff.js
index d8c324f4e3e..1b42c049778 100644
--- a/ui/effect-puff.js
+++ b/ui/effect-puff.js
@@ -29,7 +29,7 @@
}
}(function( $ ) {
-$.effects.define( "puff", "hide", function( o, done ) {
+return $.effects.define( "puff", "hide", function( o, done ) {
var options = $.extend( true, {}, o, {
fade: true,
percent: parseInt( o.percent, 10 ) || 150
diff --git a/ui/effect-pulsate.js b/ui/effect-pulsate.js
index 747e6f2c218..dd9467d7475 100644
--- a/ui/effect-pulsate.js
+++ b/ui/effect-pulsate.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "pulsate", "show", function( o, done ) {
+return $.effects.define( "pulsate", "show", function( o, done ) {
var elem = $( this ),
mode = o.mode,
show = mode === "show",
diff --git a/ui/effect-scale.js b/ui/effect-scale.js
index 071e03ac3fe..77386843e1f 100644
--- a/ui/effect-scale.js
+++ b/ui/effect-scale.js
@@ -29,7 +29,7 @@
}
}(function( $ ) {
-$.effects.define( "scale", function( o, done ) {
+return $.effects.define( "scale", function( o, done ) {
// Create element
var el = $( this ),
diff --git a/ui/effect-shake.js b/ui/effect-shake.js
index 7d34351b96b..7590a147548 100644
--- a/ui/effect-shake.js
+++ b/ui/effect-shake.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "shake", function( o, done ) {
+return $.effects.define( "shake", function( o, done ) {
var i = 1,
el = $( this ),
diff --git a/ui/effect-size.js b/ui/effect-size.js
index 6a2cbb4f7da..331187d7e6d 100644
--- a/ui/effect-size.js
+++ b/ui/effect-size.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "size", function( o, done ) {
+return $.effects.define( "size", function( o, done ) {
// Create element
var baseline, factor, temp,
diff --git a/ui/effect-slide.js b/ui/effect-slide.js
index 26bd91d2410..bfb5fec3a7e 100644
--- a/ui/effect-slide.js
+++ b/ui/effect-slide.js
@@ -28,7 +28,7 @@
}
}(function( $ ) {
-$.effects.define( "slide", "show", function( o, done ) {
+return $.effects.define( "slide", "show", function( o, done ) {
var el = $( this ),
map = {
up: [ "bottom", "top" ],
diff --git a/ui/effect-transfer.js b/ui/effect-transfer.js
index 02b34d26b65..78f12881ebe 100644
--- a/ui/effect-transfer.js
+++ b/ui/effect-transfer.js
@@ -29,7 +29,7 @@
}(function( $ ) {
if ( $.uiBackCompat !== false ) {
- $.effects.define( "transfer", function( options, done ) {
+ return $.effects.define( "transfer", function( options, done ) {
$( this ).transfer( options, done );
});
}
diff --git a/ui/effect.js b/ui/effect.js
index 18d083c7ba9..fc9e9237f4b 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1051,6 +1051,8 @@ $.extend( $.effects, {
$.effects.effect[ name ] = effect;
$.effects.effect[ name ].mode = mode;
+
+ return effect;
},
saveStyle: function( element ) {
From bf67149dc46ee3d23b1be09e9ca3afdd825c3ae9 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Fri, 12 Sep 2014 16:50:49 -0500
Subject: [PATCH 18/40] Effects: Fix css clip parsing in IE8
---
ui/effect.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/effect.js b/ui/effect.js
index fc9e9237f4b..fee2137b316 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1435,7 +1435,7 @@ $.fn.extend({
function parseClip( str, element ) {
var outerWidth = element.outerWidth(),
outerHeight = element.outerHeight(),
- clipRegex = /^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s+(-?\d*\.?\d*px|-?\d+%|auto),?\s+(-?\d*\.?\d*px|-?\d+%|auto),?\s+(-?\d*\.?\d*px|-?\d+%|auto)\)$/,
+ clipRegex = /^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,
values = clipRegex.exec( str ) || [ "", 0, outerWidth, outerHeight, 0 ];
return {
From cd3ec9f36218af0014a324a247300e5c081691c1 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Sat, 13 Sep 2014 11:56:59 -0500
Subject: [PATCH 19/40] Effects: Provide back compat for effects defined
without a default mode
---
ui/effect.js | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/ui/effect.js b/ui/effect.js
index fee2137b316..0ae4420981b 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1279,13 +1279,16 @@ $.fn.extend({
// as the .show() below destroys the initial state
modes.push( normalizedMode );
- if ( normalizedMode === "none" ) {
- return;
- }
+ // see $.uiBackCompat inside of run() for removal in 1.13
+ if ( defaultMode ) {
+ if ( normalizedMode === "none" ) {
+ return;
+ }
- if ( normalizedMode === "show" ||
- ( normalizedMode === defaultMode && normalizedMode === "hide" ) ) {
- el.show();
+ if ( normalizedMode === "show" ||
+ ( normalizedMode === defaultMode && normalizedMode === "hide" ) ) {
+ el.show();
+ }
}
$.effects.saveStyle( el );
@@ -1323,12 +1326,22 @@ $.fn.extend({
// as toggle can be show, or hide depending on element state
args.mode = modes.shift();
- if ( args.mode === "none" ) {
- // call the core method to track "olddisplay" properly
- elem[ mode ]();
- done();
+ if ( $.uiBackCompat !== false && !defaultMode ) {
+ if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
+ // call the core method to track "olddisplay" properly
+ elem[ mode ]();
+ done();
+ } else {
+ effectMethod.call( elem[ 0 ], args, done );
+ }
} else {
- effectMethod.call( elem[0], args, done );
+ if ( args.mode === "none" ) {
+ // call the core method to track "olddisplay" properly
+ elem[ mode ]();
+ done();
+ } else {
+ effectMethod.call( elem[ 0 ], args, done );
+ }
}
}
From e8a0d53ce5c4497431ac24f3e7c6cf063612cc89 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Sat, 13 Sep 2014 12:06:43 -0500
Subject: [PATCH 20/40] Effects: Add explanatory comments for prefilter step
---
ui/effect.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ui/effect.js b/ui/effect.js
index 0ae4420981b..901b0e00ef6 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1352,6 +1352,9 @@ $.fn.extend({
}
}
+ // run prefilter on all elements first to ensure that
+ // any showing or hiding happens before placeholder creation,
+ // which ensures that any layout changes are correctly captured
return queue === false ?
this.each( prefilter ).each( run ) :
this.queue( queue || "fx", prefilter ).queue( queue || "fx", run );
From fd051a0fba8baf8d3e1a286b1ad586da72679802 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Sat, 13 Sep 2014 12:17:26 -0500
Subject: [PATCH 21/40] Effects Tests: Fix failing scale test due to subpixel
accuracy
---
tests/unit/effects/effects_scale.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/unit/effects/effects_scale.js b/tests/unit/effects/effects_scale.js
index 6abbcb5382f..caed39c228c 100644
--- a/tests/unit/effects/effects_scale.js
+++ b/tests/unit/effects/effects_scale.js
@@ -6,8 +6,8 @@ function run( position, v, h, vo, ho ) {
asyncTest( desc, function() {
expect( 2 );
function complete() {
- equal( parseInt( test.css( h ), 10 ), target[ h ], "Horizontal Position Correct " + desc );
- equal( parseInt( test.css( v ), 10 ), target[ v ], "Vertical Position Correct " + desc );
+ closeEnough( parseInt( test.css( h ), 10 ), target[ h ], 1, "Horizontal Position Correct " + desc );
+ closeEnough( parseInt( test.css( v ), 10 ), target[ v ], 1, "Vertical Position Correct " + desc );
start();
}
var test = $( ".testScale" ),
From 15f0cf75e8d77facc61cd0e026aec0845c8a1db6 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Thu, 13 Nov 2014 18:38:32 -0500
Subject: [PATCH 22/40] Effects rewrite: ensure placeholder element copies
float property
---
ui/effect.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/effect.js b/ui/effect.js
index 901b0e00ef6..faf6f70c027 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1145,7 +1145,8 @@ $.extend( $.effects, {
marginTop: element.css( "marginTop" ),
marginBottom: element.css( "marginBottom" ),
marginLeft: element.css( "marginLeft" ),
- marginRight: element.css( "marginRight" )
+ marginRight: element.css( "marginRight" ),
+ "float": element.css( "float" )
})
.outerWidth( element.outerWidth() )
.outerHeight( element.outerHeight() );
From b68b4b2cf7fa2addc1fbcbbd15475e7d3c2c1728 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Fri, 14 Nov 2014 12:12:34 -0500
Subject: [PATCH 23/40] Effects Rewrite: ensure fold and blind animate the
placeholder
---
ui/effect-blind.js | 8 ++++++++
ui/effect-fold.js | 15 ++++++++++++++-
ui/effect.js | 9 +++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/ui/effect-blind.js b/ui/effect-blind.js
index 423ebc86152..2e04c8def23 100644
--- a/ui/effect-blind.js
+++ b/ui/effect-blind.js
@@ -51,9 +51,17 @@ return $.effects.define( "blind", "hide", function( o, done ) {
if ( show ) {
el.cssClip( animate.clip );
+ if ( placeholder ) {
+ placeholder.css( $.effects.clipToBox( animate ) );
+ }
+
animate.clip = start;
}
+ if ( placeholder ) {
+ placeholder.animate( $.effects.clipToBox( animate ), o.duration, o.easing );
+ }
+
el.animate( animate, {
queue: false,
duration: o.duration,
diff --git a/ui/effect-fold.js b/ui/effect-fold.js
index aebf5f72894..96a47b01231 100644
--- a/ui/effect-fold.js
+++ b/ui/effect-fold.js
@@ -67,11 +67,24 @@ return $.effects.define( "fold", "hide", function( o, done ) {
if ( show ) {
el.cssClip( animation2.clip );
+ if ( placeholder ) {
+ placeholder.css( $.effects.clipToBox( animation2 ) );
+ }
+
animation2.clip = start;
}
// Animate
el
+ .queue(function(next) {
+ if ( placeholder ) {
+ placeholder
+ .animate( $.effects.clipToBox( animation1 ), duration, o.easing )
+ .animate( $.effects.clipToBox( animation2 ), duration, o.easing );
+ }
+
+ next();
+ })
.animate( animation1, duration, o.easing )
.animate( animation2, duration, o.easing )
.queue(function() {
@@ -87,7 +100,7 @@ return $.effects.define( "fold", "hide", function( o, done ) {
// inject all the animations we just queued to be first in line (after "inprogress")
if ( queuelen > 1) {
queue.splice.apply( queue,
- [ 1, 0 ].concat( queue.splice( queuelen, 3 ) ) );
+ [ 1, 0 ].concat( queue.splice( queuelen, 4 ) ) );
}
el.dequeue();
});
diff --git a/ui/effect.js b/ui/effect.js
index faf6f70c027..f47db316d8f 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1055,6 +1055,15 @@ $.extend( $.effects, {
return effect;
},
+ clipToBox: function( animation ) {
+ return {
+ width: animation.clip.right - animation.clip.left,
+ height: animation.clip.bottom - animation.clip.top,
+ left: animation.clip.left,
+ top: animation.clip.top
+ };
+ },
+
saveStyle: function( element ) {
element.data( dataSpaceStyle, element[ 0 ].style.cssText );
},
From 32167bda4cbb8942e2a5ef664529af8f06d0d2e2 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Fri, 14 Nov 2014 18:35:35 -0500
Subject: [PATCH 24/40] Effects Rewrite: extract "unshift" method for reuse
---
ui/effect-bounce.js | 12 +-----------
ui/effect-fold.js | 13 ++-----------
ui/effect-pulsate.js | 19 ++++---------------
ui/effect-shake.js | 11 +----------
ui/effect.js | 12 ++++++++++++
5 files changed, 20 insertions(+), 47 deletions(-)
diff --git a/ui/effect-bounce.js b/ui/effect-bounce.js
index d921dfc1907..65ec684a018 100644
--- a/ui/effect-bounce.js
+++ b/ui/effect-bounce.js
@@ -50,10 +50,6 @@ return $.effects.define( "bounce", function( o, done ) {
motion = ( direction === "up" || direction === "left" ),
i = 0,
- // we will need to re-assemble the queue to stack our animations in place
- queue = el.queue(),
- queuelen = queue.length,
-
placeholder = $.effects.createPlaceholder( el ),
refValue = el.css( ref );
@@ -109,13 +105,7 @@ return $.effects.define( "bounce", function( o, done ) {
done();
});
- // inject all the animations we just queued to be first in line (after "inprogress")
- if ( queuelen > 1) {
- queue.splice.apply( queue,
- [ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
- }
- el.dequeue();
-
+ $.effects.unshift( el, anims + 1 );
});
}));
diff --git a/ui/effect-fold.js b/ui/effect-fold.js
index 96a47b01231..8d26cff1aca 100644
--- a/ui/effect-fold.js
+++ b/ui/effect-fold.js
@@ -51,11 +51,7 @@ return $.effects.define( "fold", "hide", function( o, done ) {
clip: el.cssClip()
},
- distance = [ start[ref[0]], start[ref[1]] ],
-
- // we will need to re-assemble the queue to stack our animations in place
- queue = el.queue(),
- queuelen = queue.length;
+ distance = [ start[ref[0]], start[ref[1]] ];
// define animations
if ( percent ) {
@@ -97,12 +93,7 @@ return $.effects.define( "fold", "hide", function( o, done ) {
done();
});
- // inject all the animations we just queued to be first in line (after "inprogress")
- if ( queuelen > 1) {
- queue.splice.apply( queue,
- [ 1, 0 ].concat( queue.splice( queuelen, 4 ) ) );
- }
- el.dequeue();
+ $.effects.unshift( el, 4 );
});
}));
diff --git a/ui/effect-pulsate.js b/ui/effect-pulsate.js
index dd9467d7475..032aa9fbca5 100644
--- a/ui/effect-pulsate.js
+++ b/ui/effect-pulsate.js
@@ -39,26 +39,20 @@ return $.effects.define( "pulsate", "show", function( o, done ) {
anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
duration = o.duration / anims,
animateTo = 0,
- queue = elem.queue(),
- queuelen = queue.length,
i = 1;
- if ( show || !elem.is(":visible")) {
+ if ( show || !elem.is( ":visible" ) ) {
elem.css( "opacity", 0 ).show();
animateTo = 1;
}
// anims - 1 opacity "toggles"
for ( ; i < anims; i++ ) {
- elem.animate({
- opacity: animateTo
- }, duration, o.easing );
+ elem.animate( { opacity: animateTo }, duration, o.easing );
animateTo = 1 - animateTo;
}
- elem.animate({
- opacity: animateTo
- }, duration, o.easing);
+ elem.animate( { opacity: animateTo }, duration, o.easing);
elem.queue(function() {
if ( hide ) {
@@ -68,12 +62,7 @@ return $.effects.define( "pulsate", "show", function( o, done ) {
done();
});
- // We just queued up "anims" animations, we need to put them next in the queue
- if ( queuelen > 1 ) {
- queue.splice.apply( queue,
- [ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
- }
- elem.dequeue();
+ $.effects.unshift( elem, anims + 1 );
});
}));
diff --git a/ui/effect-shake.js b/ui/effect-shake.js
index 7590a147548..dd8cf334857 100644
--- a/ui/effect-shake.js
+++ b/ui/effect-shake.js
@@ -42,9 +42,6 @@ return $.effects.define( "shake", function( o, done ) {
animation = {},
animation1 = {},
animation2 = {},
- // we will need to re-assemble the queue to stack our animations in place
- queue = el.queue(),
- queuelen = queue.length,
placeholder = $.effects.createPlaceholder( el );
// Animation
@@ -74,13 +71,7 @@ return $.effects.define( "shake", function( o, done ) {
done();
});
- // inject all the animations we just queued to be first in line (after "inprogress")
- if ( queuelen > 1) {
- queue.splice.apply( queue,
- [ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
- }
- el.dequeue();
-
+ $.effects.unshift( el, anims + 1 );
});
}));
diff --git a/ui/effect.js b/ui/effect.js
index f47db316d8f..ef6bd0cb419 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1064,6 +1064,18 @@ $.extend( $.effects, {
};
},
+ // Injects recently queued functions to be first in line (after "inprogress")
+ unshift: function( el, count ) {
+ var queue = el.queue(),
+ queuelen = queue.length;
+
+ if ( queuelen > count + 1 ) {
+ queue.splice.apply( queue,
+ [ 1, 0 ].concat( queue.splice( queuelen, count ) ) );
+ }
+ el.dequeue();
+ },
+
saveStyle: function( element ) {
element.data( dataSpaceStyle, element[ 0 ].style.cssText );
},
From b4045257b62098f472995cf4245e5dd4544c5124 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Sat, 15 Nov 2014 14:36:43 -0500
Subject: [PATCH 25/40] Effects Rewrite: add IE8 CANTFIX note to clip effect
test
---
tests/visual/effects/clip.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/visual/effects/clip.html b/tests/visual/effects/clip.html
index 66058b198c9..f56f5418909 100644
--- a/tests/visual/effects/clip.html
+++ b/tests/visual/effects/clip.html
@@ -70,6 +70,7 @@
EXPECTED: Clicking "Toggle" or "Effect Toggle" a second time reverses the animation, first showing all elements at their original dimensions, and restoring them to their original state.
EXPECTED: Clicking "Effect Default" should always perform a "hide" animation.
EXPECTED: Clicking any of the buttons in quick succession should queue the relevant animations.
+
EXPECTED CANTFIX: In IE8, the clip animation jumps due to a bug that causes .css('clip') to return undefined unless the clip property is an inline style.
From 8017d84a3c88eb6340068e1ace81b00870dcac00 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Sat, 15 Nov 2014 15:00:16 -0500
Subject: [PATCH 26/40] Effects Rewrite: Fix "unshift" method
---
ui/effect-bounce.js | 4 +++-
ui/effect-fold.js | 6 ++++--
ui/effect-pulsate.js | 5 +++--
ui/effect-shake.js | 5 ++++-
ui/effect.js | 9 ++++-----
5 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/ui/effect-bounce.js b/ui/effect-bounce.js
index 65ec684a018..224b0650a68 100644
--- a/ui/effect-bounce.js
+++ b/ui/effect-bounce.js
@@ -50,6 +50,8 @@ return $.effects.define( "bounce", function( o, done ) {
motion = ( direction === "up" || direction === "left" ),
i = 0,
+ queuelen = el.queue().length,
+
placeholder = $.effects.createPlaceholder( el ),
refValue = el.css( ref );
@@ -105,7 +107,7 @@ return $.effects.define( "bounce", function( o, done ) {
done();
});
- $.effects.unshift( el, anims + 1 );
+ $.effects.unshift( el, queuelen, anims + 1 );
});
}));
diff --git a/ui/effect-fold.js b/ui/effect-fold.js
index 8d26cff1aca..1d5996d6e49 100644
--- a/ui/effect-fold.js
+++ b/ui/effect-fold.js
@@ -51,7 +51,9 @@ return $.effects.define( "fold", "hide", function( o, done ) {
clip: el.cssClip()
},
- distance = [ start[ref[0]], start[ref[1]] ];
+ distance = [ start[ref[0]], start[ref[1]] ],
+
+ queuelen = el.queue().length;
// define animations
if ( percent ) {
@@ -93,7 +95,7 @@ return $.effects.define( "fold", "hide", function( o, done ) {
done();
});
- $.effects.unshift( el, 4 );
+ $.effects.unshift( el, queuelen, 4 );
});
}));
diff --git a/ui/effect-pulsate.js b/ui/effect-pulsate.js
index 032aa9fbca5..304848c8837 100644
--- a/ui/effect-pulsate.js
+++ b/ui/effect-pulsate.js
@@ -39,7 +39,8 @@ return $.effects.define( "pulsate", "show", function( o, done ) {
anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
duration = o.duration / anims,
animateTo = 0,
- i = 1;
+ i = 1,
+ queuelen = elem.queue().length;
if ( show || !elem.is( ":visible" ) ) {
elem.css( "opacity", 0 ).show();
@@ -62,7 +63,7 @@ return $.effects.define( "pulsate", "show", function( o, done ) {
done();
});
- $.effects.unshift( elem, anims + 1 );
+ $.effects.unshift( elem, queuelen, anims + 1 );
});
}));
diff --git a/ui/effect-shake.js b/ui/effect-shake.js
index dd8cf334857..5857305a641 100644
--- a/ui/effect-shake.js
+++ b/ui/effect-shake.js
@@ -42,6 +42,9 @@ return $.effects.define( "shake", function( o, done ) {
animation = {},
animation1 = {},
animation2 = {},
+
+ queuelen = el.queue().length,
+
placeholder = $.effects.createPlaceholder( el );
// Animation
@@ -71,7 +74,7 @@ return $.effects.define( "shake", function( o, done ) {
done();
});
- $.effects.unshift( el, anims + 1 );
+ $.effects.unshift( el, queuelen, anims + 1 );
});
}));
diff --git a/ui/effect.js b/ui/effect.js
index ef6bd0cb419..6b61d0fc337 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1065,13 +1065,12 @@ $.extend( $.effects, {
},
// Injects recently queued functions to be first in line (after "inprogress")
- unshift: function( el, count ) {
- var queue = el.queue(),
- queuelen = queue.length;
+ unshift: function( el, queueLength, count ) {
+ var queue = el.queue();
- if ( queuelen > count + 1 ) {
+ if ( queueLength > 1 ) {
queue.splice.apply( queue,
- [ 1, 0 ].concat( queue.splice( queuelen, count ) ) );
+ [ 1, 0 ].concat( queue.splice( queueLength, count ) ) );
}
el.dequeue();
},
From 77783f0bb3169a106de4e6719e977ff693cdbd86 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Mon, 17 Nov 2014 09:41:30 -0500
Subject: [PATCH 27/40] Effects Rewrite: Inline prefilter method
---
ui/effect.js | 37 +++++++++++++++----------------------
1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/ui/effect.js b/ui/effect.js
index 6b61d0fc337..e0180fb95ad 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -1290,8 +1290,7 @@ $.fn.extend({
effectMethod = $.effects.effect[ args.effect ],
defaultMode = effectMethod.mode,
modes = [],
- effectPrefilter = function() {
-
+ prefilter = function( next ) {
var el = $( this ),
normalizedMode = $.effects.mode( el, mode ) || defaultMode;
@@ -1300,21 +1299,22 @@ $.fn.extend({
// as the .show() below destroys the initial state
modes.push( normalizedMode );
- // see $.uiBackCompat inside of run() for removal in 1.13
- if ( defaultMode ) {
- if ( normalizedMode === "none" ) {
- return;
- }
+ // see $.uiBackCompat inside of run() for removal of defaultMode in 1.13
+ if ( defaultMode && ( normalizedMode === "show" ||
+ ( normalizedMode === defaultMode && normalizedMode === "hide" ) ) ) {
+ el.show();
+ }
- if ( normalizedMode === "show" ||
- ( normalizedMode === defaultMode && normalizedMode === "hide" ) ) {
- el.show();
- }
+ if ( !defaultMode || normalizedMode !== "none" ) {
+ $.effects.saveStyle( el );
}
- $.effects.saveStyle( el );
+ if ( $.isFunction( next ) ) {
+ next();
+ }
},
queue = args.queue,
+ queueName = queue || "fx",
complete = args.complete,
mode = args.mode;
@@ -1366,19 +1366,12 @@ $.fn.extend({
}
}
- function prefilter( next ) {
- effectPrefilter.call( this );
- if ( $.isFunction( next ) ) {
- next();
- }
- }
-
- // run prefilter on all elements first to ensure that
+ // Run prefilter on all elements first to ensure that
// any showing or hiding happens before placeholder creation,
- // which ensures that any layout changes are correctly captured
+ // which ensures that any layout changes are correctly captured.
return queue === false ?
this.each( prefilter ).each( run ) :
- this.queue( queue || "fx", prefilter ).queue( queue || "fx", run );
+ this.queue( queueName, prefilter ).queue( queueName, run );
},
show: (function( orig ) {
From 86c375fa4343f83db787685794fb8aa57c7a2b2a Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Mon, 17 Nov 2014 10:05:06 -0500
Subject: [PATCH 28/40] Effects Rewrite: Fix style violations in
effects_core.js
---
tests/unit/effects/effects_core.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js
index 7753f42c578..417dee074af 100644
--- a/tests/unit/effects/effects_core.js
+++ b/tests/unit/effects/effects_core.js
@@ -1,11 +1,11 @@
(function($) {
function present( value, array, message ) {
- QUnit.push( jQuery.inArray( value, array ) !== -1 , value, array, message );
+ QUnit.push( jQuery.inArray( value, array ) !== -1, value, array, message );
}
function notPresent( value, array, message ) {
- QUnit.push( jQuery.inArray( value, array ) === -1 , value, array, message );
+ QUnit.push( jQuery.inArray( value, array ) === -1, value, array, message );
}
// minDuration is used for "short" animate tests where we are only concerned about the final
@@ -229,11 +229,11 @@ $.each( $.effects.effect, function( effect ) {
}
hidden.queue( queueTest() ).show( effect, minDuration, queueTest(function() {
- equal( hidden.css("display"), "block", "Hidden is shown after .show(\"" +effect+ "\", time)" );
+ equal( hidden.css("display"), "block", "Hidden is shown after .show(\"" + effect + "\", time)" );
})).queue( queueTest() ).hide( effect, minDuration, queueTest(function() {
- equal( hidden.css("display"), "none", "Back to hidden after .hide(\"" +effect+ "\", time)" );
+ equal( hidden.css("display"), "none", "Back to hidden after .hide(\"" + effect + "\", time)" );
})).queue( queueTest(function() {
- deepEqual( hidden.queue(), ["inprogress"], "Only the inprogress sentinel remains");
+ deepEqual( hidden.queue(), [ "inprogress" ], "Only the inprogress sentinel remains");
start();
}));
});
From 4c2ffd9f61c903c77b035a3eba363b1eac772c89 Mon Sep 17 00:00:00 2001
From: Mike Sherov
Date: Mon, 17 Nov 2014 10:29:25 -0500
Subject: [PATCH 29/40] Effects Rewrite: Tests for createPlaceholder
---
tests/unit/effects/effects.html | 51 ++++++++++++++++++++----------
tests/unit/effects/effects_core.js | 38 ++++++++++++++++++++++
ui/effect.js | 16 +++++-----
3 files changed, 81 insertions(+), 24 deletions(-)
diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html
index d6cfdb7973b..a092ce04bcf 100644
--- a/tests/unit/effects/effects.html
+++ b/tests/unit/effects/effects.html
@@ -88,28 +88,47 @@
width: 100px;
}
+ .relative {
+ position: relative;
+ top: 0px;
+ left: 0px;
+ }
+ .absolute {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ }
+ .fixed {
+ position: fixed;
+ top: 0px;
+ left: 0px;
+ }
+ .static {
+ position: static;
+ }
+