Also wait for the end of all animations on the starting slide during
authorKim Nguyễn <kn@lri.fr>
Sat, 8 Jun 2013 12:06:19 +0000 (14:06 +0200)
committerKim Nguyễn <kn@lri.fr>
Sat, 8 Jun 2013 12:06:19 +0000 (14:06 +0200)
refresh to enable input events again.

simpleWebSlides.js

index cce515f..3b96882 100644 (file)
@@ -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;
         });
     };