X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=simpleWebSlides.js;h=ebab5cad10fdff2e60341f0af2944d5f5a508fde;hb=974b232a2c493d5e599c51af0fb85a354d5f2b3a;hp=f42811d77540180d441fbeff9a4083ece988502c;hpb=1a01baf63e59f5359c4af5cf2159b1e30f47ee74;p=hacks%2FsimpleWebSlides.git

diff --git a/simpleWebSlides.js b/simpleWebSlides.js
index f42811d..ebab5ca 100644
--- a/simpleWebSlides.js
+++ b/simpleWebSlides.js
@@ -57,6 +57,19 @@ SWS.Utils = new function () {
 
 SWS.Templates = new function () {
     var self = this;
+    self.helpPanel = "<div id='sws-help-panel-canvas'>\
+<h1>Keyboard shortcuts</h1>\
+<table>\
+<tr><td>c</td><td> toggle the control panel</td></tr>\
+<tr><td>Left, PgUp,swipe left</td><td> previous step</td></tr>\
+<tr><td>Right, PgDown, Space, swipe right</td><td> next step</td></tr>\
+<tr><td>p</td><td> previous slide</td></tr>\
+<tr><td>n</td><td> next slide</td></tr>\
+<tr><td>Home</td><td> first slide</td></tr>\
+<tr><td>End</td><td> last slide</td></tr>\
+<tr><td>h</td><td> toggle help</td></tr>\
+</table>\
+</div>";
     self.controlPanel = "<div id='sws-control-panel-canvas'><div id='sws-control-panel'>\
 <div id='sws-control-panel-title-bar'>\
 <a title='Toggle fullscreen' id='sws-control-panel-fullscreen' class='sws-symbol' onclick='SWS.Presentation.toggleFullScreen();'></a>\
@@ -152,6 +165,7 @@ SWS.Effects = new function () {
     var self = this;
 
     self.objectDeactivateFadeOut = function (o) {
+	if (o.is("embed")) return;
         o.animate({'opacity': '0'}, 200,
                   function () {
 
@@ -316,11 +330,18 @@ SWS.Presentation = new function () {
             sessionStorage.setItem("current_slide", i);
         };
 
+	self.showHelpAtStartup = function () {
+	    var r = sessionStorage.getItem("show_help");
+	    if (r == "hide") return false;
+	    sessionStorage.setItem("show_help", "hide");
+	    return true;
+	};
+
     } else {
         var _current_slide = 0;
         self.getCurrentSlide = function () { return _current_slide; };
         self.setCurrentSlide = function (i) { _current_slide = i; };
-
+	self.showHelpAtStartup = function () { return false; };
     };
     self.firstSlide = function () { return 0; };
     self.lastSlide = function () { return self.getNumSlides() - 1; };
@@ -354,23 +375,29 @@ SWS.Presentation = new function () {
         var cur = info.current;
         var custom = info.custom;
         var real_slide = to_slide.find(".sws-slide");
-
-        real_slide.find("*").andSelf().each(function (i){
+        var dont_touch = real_slide.find("sws-protect").find("*").addBack();
+        real_slide.find("*").addBack().not(dont_touch).each(function (i){
             var frameset = $(this).data("sws-frame-set") || {};
             if (frameset[cur])
                 SWS.Config['sws-object-activate']($(this));
             else
                 SWS.Config['sws-object-deactivate']($(this));
         });
-        var callbacks;
-        if (callbacks = info.callbacks.at_frame[self.getCurrentFrame()]){
-            for (var k = 0; k < callbacks.length; k++)
-                callbacks[k]($(to_slide));
-        };
+
 
         var all = $(from_slide).add(to_slide);
         all.find("*").addBack().promise().done(function() {
-            _disable_input_events = false;
+            var callbacks;
+            //execute callbacks when all elements are finished transitioning
+            if (callbacks = info.callbacks.at_frame[self.getCurrentFrame()]){
+                for (var k = 0; k < callbacks.length; k++)
+                    callbacks[k]($(to_slide));
+            };
+            all.find("*").addBack().promise().done(function() {
+                //wait for all elements to finish transitionning, in case a callback animate something
+                //an denable _input_events again.
+                _disable_input_events = false;
+            });
         });
     };
 
@@ -560,6 +587,7 @@ SWS.Presentation = new function () {
         default:
             return;
         };
+
         switch (code) {
         case 36:/* Home */
             self.setCurrentSlide(self.firstSlide());
@@ -591,6 +619,9 @@ SWS.Presentation = new function () {
             return;
         case 67: /* c */
             $("#sws-control-panel-canvas").toggle();
+	    return;
+        case 72: /* h */
+            $("#sws-help-panel-canvas").toggle();
 
         default:
             return;
@@ -776,12 +807,12 @@ SWS.Presentation = new function () {
             var j;
             var secnum = toc.length + '.';
             for (j = 0; j < i; ++j)
-                this_html += "<li class='done'>" + secnum + (j+1) + ' ' + 
+                this_html += "<li class='done'>" + secnum + (j+1) + ' ' +
                 sections[j].title + "</li>";
             this_html += "<li class='hl'>" + secnum + (i+1) + ' ' +
                 sections[i].title + "</li>";
             for (j = i+1; j < sections.length; j++)
-                this_html += "<li>" + secnum + (j+1) + ' ' 
+                this_html += "<li>" + secnum + (j+1) + ' '
                 +sections[j].title + "</li>";
             this_html += "</ul></li></ul></div>";
             $(this).after(this_html);
@@ -832,6 +863,7 @@ SWS.Presentation = new function () {
 
         // Initialize the control panel
         $("body").append($(SWS.Templates.controlPanel));
+        $("body").append($(SWS.Templates.helpPanel));
         // Fill the theme switcher
         $("link.sws-theme").each (function (i) {
             var e = $(this);
@@ -858,7 +890,6 @@ SWS.Presentation = new function () {
         nav.attr("max", SWS.Presentation.lastSlide() + 1);
         $('#sws-control-panel-total-slides').text('/' + SWS.Presentation.getNumSlides());
         _update_ui();
-
         _slide_callbacks = null; /* avoid a leak */
         var passed_theme = SWS.Utils.getParameterByName("theme");
 
@@ -873,12 +904,14 @@ SWS.Presentation = new function () {
                 if (SWS.Utils.getParameterByName("mode") == "print") {
                     self.printMode();
                 }
-                else
+                else {
+		    if (self.showHelpAtStartup()) $("#sws-help-panel-canvas").show();
                     self.refresh();
+		};
                 $(document).keydown(self.inputHandler);
                 document.body.addEventListener('touchstart',self.inputHandler, false);
                 document.body.addEventListener('touchend',self.inputHandler, false);
-
+		
                 _initialized = true;
             };
         setTimeout(f, 100);