Skip to content

Commit 9d9825b

Browse files
author
Martino
committed
Bugfix
1 parent 68c1a20 commit 9d9825b

File tree

3 files changed

+52
-81
lines changed

3 files changed

+52
-81
lines changed

‎plugin/appearance/appearance.esm.js‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -256,20 +256,6 @@ var Plugin = function Plugin() {
256256
return slides;
257257
};
258258

259-
Object.prototype.setTransition = function (action) {
260-
if (action == "remove") {
261-
delete this.dataset.appearanceCanStart;
262-
} else {
263-
this.dataset.appearanceCanStart = true;
264-
}
265-
};
266-
267-
var removeFrom = function removeFrom(slides) {
268-
if (slides.from && options.hideagain == true) {
269-
slides.from.setTransition("remove");
270-
}
271-
};
272-
273259
var showHideSlide = function showHideSlide(event) {
274260
var _slides$to;
275261

@@ -286,22 +272,21 @@ var Plugin = function Plugin() {
286272
}
287273

288274
if (etype == "ready") {
289-
slides.to.setTransition();
275+
slides.to.dataset.appearanceCanStart = true;
290276
}
291277

292278
if (slides.to) {
293279
var appearevent = slides.to.dataset.appearevent ? slides.to.dataset.appearevent : options.appearevent;
294280

295-
if (etype == appearevent) {
296-
slides.to.setTransition();
297-
} else if (etype == "slidetransitionend" && appearevent == "autoanimate") {
298-
slides.to.setTransition();
281+
if (etype == appearevent || etype == "slidetransitionend" && appearevent == "autoanimate") {
282+
slides.to.dataset.appearanceCanStart = true;
299283
}
300284

301285
if (etype == "slidetransitionend") {
302-
removeFrom(slides);
303-
304286
if (options.hideagain) {
287+
var _slides$from;
288+
289+
(_slides$from = slides.from) === null || _slides$from === void 0 ? true : delete _slides$from.dataset.appearanceCanStart;
305290
var fromFragments = slides.from.querySelectorAll(".fragment.visible");
306291
fromFragments.forEach(function (fragment) {
307292
fragment.classList.remove('visible');
@@ -310,19 +295,27 @@ var Plugin = function Plugin() {
310295
}
311296

312297
if (event.type == 'slidechanged' && document.body.dataset.exitoverview) {
313-
removeFrom(slides);
314-
slides.to.setTransition();
315-
slides.to.dataset.eventdone = true;
298+
if (options.hideagain) {
299+
var _slides$from2;
300+
301+
(_slides$from2 = slides.from) === null || _slides$from2 === void 0 ? true : delete _slides$from2.dataset.appearanceCanStart;
302+
}
303+
304+
slides.to.dataset.appearanceCanStart = true;
316305
} else if (event.type == 'overviewhidden') {
317306
document.body.dataset.exitoverview = true;
318307
setTimeout(function () {
319308
document.body.removeAttribute('data-exitoverview');
320309
}, 500);
321310

322311
if (event.currentSlide) {
323-
removeFrom(slides);
324-
slides.to.setTransition();
325-
event.currentSlide.dataset.eventdone = true;
312+
if (options.hideagain) {
313+
var _slides$from3;
314+
315+
(_slides$from3 = slides.from) === null || _slides$from3 === void 0 ? true : delete _slides$from3.dataset.appearanceCanStart;
316+
}
317+
318+
slides.to.dataset.appearanceCanStart = true;
326319
}
327320
}
328321
}

‎plugin/appearance/appearance.js‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -262,20 +262,6 @@
262262
return slides;
263263
};
264264

265-
Object.prototype.setTransition = function (action) {
266-
if (action == "remove") {
267-
delete this.dataset.appearanceCanStart;
268-
} else {
269-
this.dataset.appearanceCanStart = true;
270-
}
271-
};
272-
273-
var removeFrom = function removeFrom(slides) {
274-
if (slides.from && options.hideagain == true) {
275-
slides.from.setTransition("remove");
276-
}
277-
};
278-
279265
var showHideSlide = function showHideSlide(event) {
280266
var _slides$to;
281267

@@ -292,22 +278,21 @@
292278
}
293279

294280
if (etype == "ready") {
295-
slides.to.setTransition();
281+
slides.to.dataset.appearanceCanStart = true;
296282
}
297283

298284
if (slides.to) {
299285
var appearevent = slides.to.dataset.appearevent ? slides.to.dataset.appearevent : options.appearevent;
300286

301-
if (etype == appearevent) {
302-
slides.to.setTransition();
303-
} else if (etype == "slidetransitionend" && appearevent == "autoanimate") {
304-
slides.to.setTransition();
287+
if (etype == appearevent || etype == "slidetransitionend" && appearevent == "autoanimate") {
288+
slides.to.dataset.appearanceCanStart = true;
305289
}
306290

307291
if (etype == "slidetransitionend") {
308-
removeFrom(slides);
309-
310292
if (options.hideagain) {
293+
var _slides$from;
294+
295+
(_slides$from = slides.from) === null || _slides$from === void 0 ? true : delete _slides$from.dataset.appearanceCanStart;
311296
var fromFragments = slides.from.querySelectorAll(".fragment.visible");
312297
fromFragments.forEach(function (fragment) {
313298
fragment.classList.remove('visible');
@@ -316,19 +301,27 @@
316301
}
317302

318303
if (event.type == 'slidechanged' && document.body.dataset.exitoverview) {
319-
removeFrom(slides);
320-
slides.to.setTransition();
321-
slides.to.dataset.eventdone = true;
304+
if (options.hideagain) {
305+
var _slides$from2;
306+
307+
(_slides$from2 = slides.from) === null || _slides$from2 === void 0 ? true : delete _slides$from2.dataset.appearanceCanStart;
308+
}
309+
310+
slides.to.dataset.appearanceCanStart = true;
322311
} else if (event.type == 'overviewhidden') {
323312
document.body.dataset.exitoverview = true;
324313
setTimeout(function () {
325314
document.body.removeAttribute('data-exitoverview');
326315
}, 500);
327316

328317
if (event.currentSlide) {
329-
removeFrom(slides);
330-
slides.to.setTransition();
331-
event.currentSlide.dataset.eventdone = true;
318+
if (options.hideagain) {
319+
var _slides$from3;
320+
321+
(_slides$from3 = slides.from) === null || _slides$from3 === void 0 ? true : delete _slides$from3.dataset.appearanceCanStart;
322+
}
323+
324+
slides.to.dataset.appearanceCanStart = true;
332325
}
333326
}
334327
}

‎plugin/appearance/plugin-src.js‎

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -133,21 +133,6 @@ const Plugin = () => {
133133
return slides
134134
}
135135

136-
Object.prototype.setTransition = function(action) {
137-
if (action == "remove") {
138-
delete this.dataset.appearanceCanStart;
139-
140-
} else {
141-
this.dataset.appearanceCanStart = true;
142-
}
143-
};
144-
145-
const removeFrom = function(slides) {
146-
if (slides.from && options.hideagain == true) {
147-
slides.from.setTransition("remove");
148-
}
149-
}
150-
151136
const showHideSlide = function(event) {
152137

153138
let etype = event.type;
@@ -158,22 +143,20 @@ const Plugin = () => {
158143
if (options.appearevent == "auto") {options.appearevent = "autoanimate"}
159144

160145
if (etype == "ready") {
161-
slides.to.setTransition();
146+
slides.to.dataset.appearanceCanStart = true;
162147
}
163148

164149
if (slides.to) {
165150

166151
let appearevent = slides.to.dataset.appearevent ? slides.to.dataset.appearevent : options.appearevent;
167152

168-
if (etype == appearevent ) {
169-
slides.to.setTransition();
170-
} else if (etype == "slidetransitionend" && appearevent == "autoanimate") {
171-
slides.to.setTransition();
153+
if (etype == appearevent || (etype == "slidetransitionend" && appearevent == "autoanimate")) {
154+
slides.to.dataset.appearanceCanStart = true;
172155
}
173156

174157
if (etype == "slidetransitionend") {
175-
removeFrom(slides);
176158
if (options.hideagain) {
159+
delete slides.from?.dataset.appearanceCanStart;
177160
let fromFragments = slides.from.querySelectorAll(`.fragment.visible`);
178161
fromFragments.forEach(fragment => {
179162
fragment.classList.remove('visible');
@@ -182,9 +165,10 @@ const Plugin = () => {
182165
}
183166

184167
if (event.type == 'slidechanged' && document.body.dataset.exitoverview) {
185-
removeFrom(slides);
186-
slides.to.setTransition()
187-
slides.to.dataset.eventdone = true;
168+
if (options.hideagain) {
169+
delete slides.from?.dataset.appearanceCanStart;
170+
}
171+
slides.to.dataset.appearanceCanStart = true;
188172

189173
} else if (event.type == 'overviewhidden' ) {
190174

@@ -195,9 +179,10 @@ const Plugin = () => {
195179
}, 500)
196180

197181
if (event.currentSlide ) {
198-
removeFrom(slides);
199-
slides.to.setTransition();
200-
event.currentSlide.dataset.eventdone = true;
182+
if (options.hideagain) {
183+
delete slides.from?.dataset.appearanceCanStart;
184+
}
185+
slides.to.dataset.appearanceCanStart = true;
201186
}
202187
}
203188
}

0 commit comments

Comments
 (0)