Skip to content

Commit b0ae7f3

Browse files
committed
Effects: rename effect.removePlaceholder to effect.cleanUpPlaceholder
1 parent e5d37ae commit b0ae7f3

File tree

9 files changed

+18
-17
lines changed

9 files changed

+18
-17
lines changed

ui/effect-blind.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ $.effects.define( "blind", "hide", function( o, done ) {
5555
easing: o.easing,
5656
complete: function() {
5757

58-
$.effects.removePlaceholder( placeholder, el );
58+
$.effects.cleanUpPlaceholder( placeholder, el );
5959

6060
if ( !show ) {
6161
el.hide();

ui/effect-bounce.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ $.effects.define( "bounce", function( o, done ) {
9595
}
9696

9797
el.queue(function() {
98-
$.effects.removePlaceholder( placeholder, el );
98+
$.effects.cleanUpPlaceholder( placeholder, el );
9999

100100
if ( hide ) {
101101
el.hide();

ui/effect-clip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ $.effects.define( "clip", "hide", function( o, done ) {
5454
easing: o.easing,
5555
complete: function() {
5656

57-
$.effects.removePlaceholder( placeholder, el );
57+
$.effects.cleanUpPlaceholder( placeholder, el );
5858

5959
if ( !show ) {
6060
el.hide();

ui/effect-drop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ $.effects.define( "drop", "hide", function( o, done ) {
5555
duration: o.duration,
5656
easing: o.easing,
5757
complete: function() {
58-
$.effects.removePlaceholder( placeholder, el );
58+
$.effects.cleanUpPlaceholder( placeholder, el );
5959

6060
if ( mode === "hide" ) {
6161
el.hide();

ui/effect-fold.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $.effects.define( "fold", "hide", function( o, done ) {
7070
.animate( animation1, duration, o.easing )
7171
.animate( animation2, duration, o.easing )
7272
.queue(function() {
73-
$.effects.removePlaceholder( placeholder, el );
73+
$.effects.cleanUpPlaceholder( placeholder, el );
7474

7575
if ( hide ) {
7676
el.hide();

ui/effect-shake.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,13 @@ $.effects.define( "shake", function( o, done ) {
5454
for ( ; i < times; i++ ) {
5555
el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
5656
}
57+
5758
el
5859
.animate( animation1, speed, o.easing )
5960
.animate( animation, speed / 2, o.easing )
6061
.queue(function() {
6162

62-
$.effects.removePlaceholder( placeholder, el );
63+
$.effects.cleanUpPlaceholder( placeholder, el );
6364

6465
if ( o.mode === "hide" ) {
6566
el.hide();

ui/effect-size.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ $.effects.define( "size", function( o, done ) {
180180
var offset = el.offset();
181181

182182
if ( restore ) {
183-
$.effects.removePlaceholder( placeholder, el );
183+
$.effects.cleanUpPlaceholder( placeholder, el );
184184
}
185185

186186
if ( to.opacity === 0 ) {
@@ -191,10 +191,7 @@ $.effects.define( "size", function( o, done ) {
191191
}
192192

193193
if ( !restore ) {
194-
195-
if ( placeholder ) {
196-
placeholder.remove();
197-
}
194+
$.effects.removePlaceholder( placeholder );
198195

199196
el.css("position", position === "static" ? "relative" : position );
200197

ui/effect-slide.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ $.effects.define( "slide", "show", function( o, done ) {
6060
duration: o.duration,
6161
easing: o.easing,
6262
complete: function() {
63-
$.effects.removePlaceholder( placeholder, el );
63+
$.effects.cleanUpPlaceholder( placeholder, el );
6464

6565
if ( mode === "hide" ) {
6666
el.hide();

ui/effect.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,16 +1151,19 @@ $.extend( $.effects, {
11511151
return placeholder;
11521152
},
11531153

1154-
// removes a placeholder if it exists and restores
1155-
// properties that were modified during placeholder creation
1156-
removePlaceholder: function( placeholder, el ) {
1157-
$.effects.restoreStyle( el );
1158-
1154+
removePlaceholder: function( placeholder ) {
11591155
if ( placeholder ) {
11601156
placeholder.remove();
11611157
}
11621158
},
11631159

1160+
// removes a placeholder if it exists and restores
1161+
// properties that were modified during placeholder creation
1162+
cleanUpPlaceholder: function( placeholder, el ) {
1163+
$.effects.restoreStyle( el );
1164+
$.effects.removePlaceholder( placeholder );
1165+
},
1166+
11641167
setTransition: function( element, list, factor, value ) {
11651168
value = value || {};
11661169
$.each( list, function( i, x ) {

0 commit comments

Comments
 (0)