X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=simpleWebSlides.js;h=59c5a3f7bf5afefc0e5fd7a683caa458630d0568;hb=HEAD;hp=6229a74fb7b68d420e6c0d58670f70cbe004c3f4;hpb=8c3cd44b47743bc0918e35b14e262563589c9da3;p=hacks%2FsimpleWebSlides.git diff --git a/simpleWebSlides.js b/simpleWebSlides.js index 6229a74..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 () {
\
\ 💻\ @@ -105,7 +118,6 @@ SWS.Templates = new function () { self.objectActivate = function (o) { if (!(o.hasClass("sws-active-object"))){ o.removeClass("sws-inactive-object").addClass("sws-active-object"); - o.css({'visibility':'visible'}); return true; }; return false; @@ -151,10 +163,14 @@ SWS.Config = new SWS.ConfigBuilder (); SWS.Effects = new function () { var self = this; - + self.objectDeactivateFadeOut = function (o) { - o.animate({'opacity': '0.1'}, 200, - function () { SWS.Templates.objectDeactivate(o)}); + if (o.is("embed")) return; + o.animate({'opacity': '0'}, 200, + function () { + + SWS.Templates.objectDeactivate(o); + }); }; self.objectActivateFadeIn = function (o) { @@ -168,11 +184,11 @@ SWS.Effects = new function () { self.slideChangeHorizontalFlip = function (from, to){ var f = SWS.Presentation.getSlide(from); var t = SWS.Presentation.getSlide(to); - f.animate({ 'left': '50%', 'width': '0pt', 'opacity':'0.2' }, 150, + f.animate({ 'left': '50%', 'width': '0pt', 'opacity':'0' }, 150, function () { SWS.Templates.slideDeactivate(f); f.css({'left':'0%', 'width': '100%'}); - t.css({ 'left': '50%', 'width': '0pt','opacity':'0.3' }); + t.css({ 'left': '50%', 'width': '0pt','opacity':'0' }); SWS.Templates.slideActivate(t); t.animate({'left':'0%', 'width': '100%','opacity':'1'}); }); @@ -180,10 +196,10 @@ SWS.Effects = new function () { self.slideChangeFadeOutIn = function (from, to) { var f = SWS.Presentation.getSlide(from); var t = SWS.Presentation.getSlide(to); - f.animate({ 'opacity': '0.4'}, 150, + f.animate({ 'opacity': '0'}, 150, function () { SWS.Templates.slideDeactivate(f); SWS.Templates.slideActivate(t); - t.css('opacity', '0.5'); + t.css('opacity', '0'); t.animate({ 'opacity': '1'}, 150); }); }; @@ -195,14 +211,14 @@ SWS.Effects = new function () { t.css('opacity', '1'); SWS.Templates.slideActivate(t); f.animate({ 'left': '-100%' }, 250, function () { SWS.Templates.slideDeactivate(f); - f.css('opacity', '0.6'); + f.css('opacity', '0'); t.animate({ 'left': '0%' }, 250); }); } else { t.css('left', '-100%'); SWS.Templates.slideActivate(t); f.animate({ 'left': '100%' }, 250, function () { SWS.Templates.slideDeactivate(f); - f.css('opacity', '0.7'); + f.css('opacity', '0'); }); t.css('opacity', '1'); t.animate({ 'left': '0%' }, 250); @@ -291,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 }); }; @@ -313,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; }; @@ -351,8 +374,8 @@ 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)); @@ -360,15 +383,20 @@ SWS.Presentation = new function () { 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; + }); }); }; @@ -398,7 +426,6 @@ SWS.Presentation = new function () { $(".sws-canvas").each(function(i) { var canvas = $($(".sws-canvas")[i]); var infos = canvas.data("sws-frame-info"); - console.log(infos); _total_steps += infos.last + 1; }); return _total_steps; @@ -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); @@ -469,13 +501,14 @@ SWS.Presentation = new function () { var loop; loop = function () { if (steps >= 0) { + //Crazy workaround for chromium + ($("link.sws-theme[rel='stylesheet']")[0]).disabled = false; $(".sws-canvas").find("*").addBack().promise().done(function() { var percent = ((total_steps - steps) / total_steps) * 100; $("#sws-percent-progress").text(Math.round(percent)); - console.log ("Step: " + steps); SWS.Config['sws-slide-change'] = SWS.Templates.slideChange; self.refresh(); - $($(".sws-canvas")[self.getCurrentSlide()]).css( { 'opacity': 1 }); + $($(".sws-canvas")[self.getCurrentSlide()]).css('opacity', 1 ); self.next(); steps--; loop(); @@ -483,16 +516,96 @@ SWS.Presentation = new function () { } else { $("#sws-percent-progress").text(100); progress.remove(); - window.print(); + 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; + self.inputHandler = function (event) { - if (_disable_input_events || _print_mode ) return; - switch (event.which) { + if (_disable_input_events || _print_mode) return; + var code = 0; + switch (event.type) { + case 'touchstart': + _startTouch = event.changedTouches[0]; + return; + case 'touchend': + 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; + break; + default: + return; + }; + + switch (code) { case 36:/* Home */ self.setCurrentSlide(self.firstSlide()); break; @@ -500,10 +613,11 @@ SWS.Presentation = new function () { case 35:/* End */ self.setCurrentSlide(self.lastSlide()); break; - 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(); @@ -514,21 +628,26 @@ SWS.Presentation = new function () { case 8: /* backspace */ case 33: /* PgUp */ case 37: /* <- */ + case 177: /* Multimedia skip backward */ self.previous(); break; case 80: /* p */ self.previousSlide(); break; case 83: /* s */ - self.cycleStyle(); + self.cycleStyle(); return; case 67: /* c */ $("#sws-control-panel-canvas").toggle(); + return; + case 72: /* h */ + $("#sws-help-panel-canvas").toggle(); + default: return; }; self.refresh(); - }; +}; @@ -561,7 +680,7 @@ SWS.Presentation = new function () { } }; - var specials = null; + var specials = $([]); slide.find('*[class*="sws-onframe-"]').each(function(_){ var cls = $(this).attr('class'); @@ -574,12 +693,10 @@ SWS.Presentation = new function () { for(var f in o) if (f > last_frame) last_frame = f; $(this).find("*").andSelf().each(function(_){ - if (!SWS.Utils.isEmpty(o)) + if (!SWS.Utils.isEmpty(o)){ $(this).data("sws-frame-set", o); - if (specials) - specials.add($(this)); - else - specials = $(this); + } + specials = specials.add($(this)); }); }; }); @@ -601,19 +718,42 @@ SWS.Presentation = new function () { }; /* Forces redrawing the page without reloading */ - self.redraw = function () { - $("body").hide(); - $("body").show(); + self.redraw = function (f) { + if (SWS.Utils.isUndefined(f)) + $("body").hide().show(400, function () { + $("body").css("display","block"); + if (!SWS.Utils.isUndefined(f)) + f(); + }); }; - 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(); }; + self.getCurrentTheme = function () { + var l = $("link.sws-theme[rel='stylesheet']")[0]; + + if (l) { + return l.title; + } else + return "" + }; self.changeTheme = function (name) { var theme_name; @@ -621,26 +761,27 @@ SWS.Presentation = new function () { theme_name = $("#sws-theme-select").val() else theme_name = name; + _current_theme = theme_name; $("link.sws-theme").each (function (i) { - var e = $(this); - var title = e.attr("title"); + var e = this; + var title = e.title; if (title == theme_name) { - e[0].rel = "stylesheet"; - e[0].disabled = false; - e[0].media="all"; - + e.rel = "stylesheet"; + e.disabled = false; + e.media="all"; } else { - e[0].rel = "alternate stylesheet"; - e[0].disabled = true; - e[0].media="all"; + e.rel = "alternate stylesheet"; + e.disabled = true; + e.media="all"; }; }); self.redraw(); + }; self.openPrint = function () { - window.open("?mode=print&theme=" + _current_theme); + window.open ("?mode=print&theme=" + self.getCurrentTheme()); } var _fullscreen_icon_on = ""; var _fullscreen_icon_off = ""; @@ -674,27 +815,58 @@ SWS.Presentation = new function () { $("html").addClass("sws-display"); - $(window).resize(self.redraw); - + //$(window).resize(self.redraw); - $(window).bind('storage', function (e) { - console.log(e); - }); + 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; - $(document).keydown(self.inputHandler); + 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) { - var cur = self.getCurrentSlide(); - $(".sws-slide").each (function (i) { var par = $(this).parent(); + $(this).remove(); var canvas = $('
'); if (!($(this).hasClass("sws-option-noheader"))) { - canvas.append($('

')); + 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 = $('
'); @@ -702,8 +874,15 @@ SWS.Presentation = new function () { $(this).find('script[type="text/javascript"]').remove(); content.append($(this)); inner.append(content); - inner.append($('
')); 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($('