X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=simpleWebSlides.js;h=59c5a3f7bf5afefc0e5fd7a683caa458630d0568;hb=HEAD;hp=8f49714fbed75c7fa3ad87ca034c1234bc2c38d0;hpb=6465516e70258f542937c1c8b1fe63599086d66d;p=hacks%2FsimpleWebSlides.git diff --git a/simpleWebSlides.js b/simpleWebSlides.js index 8f49714..59c5a3f 100644 --- a/simpleWebSlides.js +++ b/simpleWebSlides.js @@ -57,6 +57,19 @@ SWS.Utils = new function () { SWS.Templates = new function () { var self = this; + self.helpPanel = "
\ +

Keyboard shortcuts

\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +
h toggle help
c toggle the control panel
Left, PgUp,swipe left previous step
Right, PgDown, Space, swipe right next step
p previous slide
n next slide
Home first slide
End last slide
\ +
"; self.controlPanel = "
\
\ \ @@ -64,7 +77,7 @@ SWS.Templates = new function () {
\
\ 💻\ @@ -150,8 +163,9 @@ SWS.Config = new SWS.ConfigBuilder (); SWS.Effects = new function () { var self = this; - + self.objectDeactivateFadeOut = function (o) { + if (o.is("embed")) return; o.animate({'opacity': '0'}, 200, function () { @@ -293,9 +307,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 }); }; @@ -315,11 +329,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; }; @@ -353,23 +374,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 + //and enable _input_events again. + _disable_input_events = false; + }); }); }; @@ -459,6 +486,11 @@ SWS.Presentation = new function () { self.printMode = function () { _print_mode = true; + + var old_fx_status = $.fx.off; + //disable animation while printing. + + $.fx.off = true; var progress = $("
Rendering presentation: %
"); $("body").append(progress); @@ -484,27 +516,87 @@ SWS.Presentation = new function () { } else { $("#sws-percent-progress").text(100); progress.remove(); + window.status = 'Ready'; + $.fx.off = old_fx_status; + } }; loop(); } + 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() + .replace ("&", "&") + .replace("'","'") + .replace('"', """) + .replace("<", "<") + .replace(">", ">"), + '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 _startTouch = null; - var _xstart = 0; self.inputHandler = function (event) { if (_disable_input_events || _print_mode) return; var code = 0; switch (event.type) { case 'touchstart': - _xstart = event.changedTouches[0].clientX; + _startTouch = event.changedTouches[0]; return; case 'touchend': - - 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; + if (!_startTouch) return; + var _endTouch = event.changedTouches[0]; + var Xdist = _endTouch.clientX - _startTouch.clientX; + var Ydist = _endTouch.clientY - _startTouch.clientY; + if (Xdist > 40) code = 39 + else if (Xdist < -40) code = 37 + else if (Ydist > 20 && !$("#sws-control-panel-canvas").is(":visible")) code = 67; + else if (Ydist < -20 && $("#sws-control-panel-canvas").is(":visible")) code = 67; + else code = 39; break; case 'keydown': code = event.which; @@ -512,6 +604,7 @@ SWS.Presentation = new function () { default: return; }; + switch (code) { case 36:/* Home */ self.setCurrentSlide(self.firstSlide()); @@ -523,6 +616,8 @@ SWS.Presentation = new function () { case 32: /* space */ case 34: /* PgDown */ case 39: /* -> */ + case 176: /* Multimedia skip forward */ + case 179: /* Multimedia play/pause */ if (self.getCurrentSlide() == self.lastSlide() && self.getCurrentFrame() == self.lastFrame()) return; self.next(); @@ -533,6 +628,7 @@ SWS.Presentation = new function () { case 8: /* backspace */ case 33: /* PgUp */ case 37: /* <- */ + case 177: /* Multimedia skip backward */ self.previous(); break; case 80: /* p */ @@ -543,6 +639,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; @@ -628,10 +727,22 @@ SWS.Presentation = new function () { }); }; self.changeAspect = function() { + if (_print_mode) return; + var newClass = $("#sws-aspect-select").val(); + var args = newClass.split("-"); + var targetRatio = (args[2] - 0) / (args[3] - 0); + var realRatio = window.innerWidth / window.innerHeight; + var byClass = (targetRatio > realRatio ) ? "sws-by-height" : "sws-by-width"; + if ($("html").hasClass(newClass) + && $("html").hasClass(byClass)) + return; + $("html").removeClass("sws-aspect-4-3") .removeClass("sws-aspect-16-9") .removeClass("sws-aspect-16-10") - .addClass($("#sws-aspect-select").val()); + .removeClass("sws-by-width") + .removeClass("sws-by-height") + .addClass(newClass).addClass(byClass); self.redraw(); }; @@ -706,11 +817,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 = "

Plan

    "; + var i; + for (i= 0; i < toc.length - 1; i++) + common_html += "
  • " + (i+1) + + ' ' + toc[i].title + "
  • "; + + common_html += "
  • " + toc.length + ' ' + toc[toc.length - 1].title; + common_html += "
      "; + 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 += "
    • " + secnum + (j+1) + ' ' + + sections[j].title + "
    • "; + this_html += "
    • " + secnum + (i+1) + ' ' + + sections[i].title + "
    • "; + for (j = i+1; j < sections.length; j++) + this_html += "
    • " + secnum + (j+1) + ' ' + +sections[j].title + "
    • "; + this_html += "
"; + $(this).after(this_html); + }); $(".sws-slide").each(function (i) { @@ -723,18 +861,28 @@ SWS.Presentation = new function () { if (!($(this).hasClass("sws-option-noheader"))) { canvas.append($('
')); }; + if (!$(this).hasClass("sws-cover")) { var title = $($(this).find("h1")[0]); var title_div = $('
'); title_div.append(title); canvas.append(title_div); - } + }; + var inner = $('
'); var content = $('
'); $(this).find('script[type="text/javascript"]').remove(); content.append($(this)); inner.append(content); canvas.append(inner); + var that = this; + [ "sws-cover", "sws-toc" ].forEach( + function(v) { + if ($(that).hasClass(v)) { + inner.addClass(v); + $(that).removeClass(v); + } + }); if (!($(this).hasClass("sws-option-nofooter"))) { canvas.append($('