X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=simpleWebSlides.js;h=cc030cf277f5bccea7b5c8d758a6f1ddecd19c10;hb=fa6d07882f3a5c0f466e3f111d165a8af806095a;hp=8f49714fbed75c7fa3ad87ca034c1234bc2c38d0;hpb=6465516e70258f542937c1c8b1fe63599086d66d;p=hacks%2FsimpleWebSlides.git

diff --git a/simpleWebSlides.js b/simpleWebSlides.js
index 8f49714..cc030cf 100644
--- a/simpleWebSlides.js
+++ b/simpleWebSlides.js
@@ -293,8 +293,9 @@ SWS.Presentation = new function () {
         if (_initialized) return;
         //jQuery does not seem to work well
         //on a partial DOM
-
-        var slide_num = $(".sws-slide").length - 1;
+        var slides = $(".sws-slide");
+        var h1s = $("body").children("h1");
+        var slide_num = slides.add(h1s).length - 1;
 
         SWS.Utils.push2(_slide_callbacks, slide_num,{ 'fn': f, 'frame': i });
 
@@ -353,23 +354,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;
+            });
         });
     };
 
@@ -490,6 +497,53 @@ SWS.Presentation = new function () {
 
     }
 
+    self.buildFullTOC = function () {
+
+        var build_sections = function (doc) {
+            var res = [];
+            var h1s = doc.find("body").first().children("h1");
+            var slides = doc.find("body").first().children(".sws-slide");
+            var slide_num = 1;
+            var collection = h1s.add(slides);
+            collection.each (function () {
+                if ($(this).is("h1")) {
+                    res.push({ 'title' : $(this).text(),
+                               'slide' : slide_num });
+                } else {
+                    slide_num++;
+                }
+            });
+            return res;
+        };
+
+        var toc = [];
+
+        var append = function (a,e) {
+            return a.push(e);
+        };
+        var prepend = function (a,e) {
+            return a.unshift(e);
+        };
+
+        var loop = function (doc, dir, add, ignoreFirst) {
+            if (ignoreFirst !== true) {
+                var this_toc = { 'title' : doc.find("title").first().text(),
+                                 'sections' : build_sections(doc) };
+                add(toc, this_toc);
+            };
+            var url = doc.find(dir).first().attr("href");
+            if (!SWS.Utils.isUndefined(url) && url != "") {
+                $.ajax({ 'url' : url, 'async' : false ,'success' : function (page) {
+                    loop ($(page), dir, add, false);
+                }});
+            };
+        };
+        loop ($(document), ".sws-previous", prepend, false);
+        return toc;
+
+    };
+
+
 
     var _xstart = 0;
     self.inputHandler = function (event) {
@@ -504,7 +558,7 @@ SWS.Presentation = new function () {
             var dist = event.changedTouches[0].clientX - _xstart;
             if (dist > 20) code = 37
             else if (dist < -20) code = 39
-            else if (event.changedTouches.length > 1) code = 67;
+            else if (!$("#sws-control-panel-canvas").is(":visible")) code = 67;
             break;
         case 'keydown':
             code = event.which;
@@ -706,11 +760,38 @@ SWS.Presentation = new function () {
         $("html").addClass("sws-display");
         //$(window).resize(self.redraw);
 
+        var slides = $(".sws-slide");
+        var h1s = $("body").children("h1");
+        var slide_num = slides.add(h1s).length - 1;
 
-
-        _total_slides = $(".sws-slide").length;
+        _total_slides = $(".sws-slide").add($("body").children("h1")).length;
 
         var cur = self.getCurrentSlide();
+        var toc = self.buildFullTOC();
+        var common_html = "<div class='sws-slide sws-toc'><h1>Plan</h1><ul style='list-style-type:none'>";
+        var i;
+        for (i= 0; i < toc.length - 1; i++)
+            common_html += "<li class='done'>" + (i+1) +
+            ' ' + toc[i].title + "</li>";
+
+        common_html += "<li>" + toc.length + ' ' + toc[toc.length - 1].title;
+        common_html += "<ul style='list-style-type:none' >";
+        var sections = toc[toc.length - 1].sections;
+        $("body").children("h1").each(function (i) {
+            var this_html = common_html;
+            var j;
+            var secnum = toc.length + '.';
+            for (j = 0; j < i; ++j)
+                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) + ' ' 
+                +sections[j].title + "</li>";
+            this_html += "</ul></li></ul></div>";
+            $(this).after(this_html);
+        });
 
         $(".sws-slide").each(function (i) {
 
@@ -786,6 +867,8 @@ SWS.Presentation = new function () {
 
         _slide_callbacks = null; /* avoid a leak */
         var passed_theme = SWS.Utils.getParameterByName("theme");
+
+
         //workaround weird chrome CSS loading bug
         var f =
             function () {