From 66af3d2f6e27d88e177c7b299bb8ac179574eecc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kim=20Nguy=E1=BB=85n?= Date: Sat, 8 Jun 2013 14:06:19 +0200 Subject: [PATCH] Also wait for the end of all animations on the starting slide during refresh to enable input events again. --- simpleWebSlides.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/simpleWebSlides.js b/simpleWebSlides.js index cce515f..3b96882 100644 --- a/simpleWebSlides.js +++ b/simpleWebSlides.js @@ -262,6 +262,7 @@ SWS.Presentation = new function () { var to_slide_num = self.getCurrentSlide(); var watch_slide_anim = false; var to_slide = $(canvas[to_slide_num]); + var from_slide = $(canvas[from_slide_num]); var slide_change = (from_slide_num != to_slide_num); var info = to_slide.data("sws-frame-info"); @@ -296,12 +297,8 @@ SWS.Presentation = new function () { callbacks[k]($(to_slide)); }; - var to_watch = $(to_slide).find("*"); - if (watch_slide_anim) { - to_watch = to_watch.add(to_slide).add($(canvas[from_slide_num])); - }; - - to_watch.find("*").promise().done(function() { + var all = $(from_slide).add(to_slide); + all.find("*").addBack().promise().done(function() { _disable_input_events = false; }); }; -- 2.17.1