X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=simpleWebSlides.js;h=ebab5cad10fdff2e60341f0af2944d5f5a508fde;hb=9482b8b27b70c6f885abbf98d69b5256ce8a2ea2;hp=c7172d90f26c46b6423cbfa6be152b2d73545bd5;hpb=515191d8372d17ae881e223402bc025d42da5077;p=hacks%2FsimpleWebSlides.git diff --git a/simpleWebSlides.js b/simpleWebSlides.js index c7172d9..ebab5ca 100644 --- a/simpleWebSlides.js +++ b/simpleWebSlides.js @@ -44,7 +44,12 @@ SWS.Utils = new function () { return result; }; - + self.getParameterByName = function (name) { + name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]"); + var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"), + results = regex.exec(location.search); + return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); + } }; @@ -52,13 +57,45 @@ SWS.Utils = new function () { SWS.Templates = new function () { var self = this; - self.controlPanel = "
\ -◀◀◀\ -◀◀ \ -◀\ -▶\ -▶▶\ -▶▶▶\ + self.helpPanel = "
\ +

Keyboard shortcuts

\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +
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
h toggle help
\ +
"; + self.controlPanel = "
\ +
\ +\ +✖\ +
\ +
\ +💻\ +🎨\ +\ +
\ +
\ +⏮\ +⏪\ +▶\ +▶\ +⏩\ +⏭\ +
\ +\ +\ +
\ +
\
"; self.slideActivate = function (o) { if (!(o.hasClass("sws-active-slide"))){ @@ -81,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; @@ -129,8 +165,12 @@ SWS.Effects = new function () { var self = this; self.objectDeactivateFadeOut = function (o) { + if (o.is("embed")) return; o.animate({'opacity': '0'}, 200, - function () { SWS.Templates.objectDeactivate(o)}); + function () { + + SWS.Templates.objectDeactivate(o); + }); }; self.objectActivateFadeIn = function (o) { @@ -168,13 +208,19 @@ SWS.Effects = new function () { var t = SWS.Presentation.getSlide(to); if (from < to) { t.css('left', '100%'); + t.css('opacity', '1'); SWS.Templates.slideActivate(t); - f.animate({ 'left': '-100%' }, 250, function () { SWS.Templates.slideDeactivate(f); }); - t.animate({ 'left': '0%' }, 250); + f.animate({ 'left': '-100%' }, 250, function () { SWS.Templates.slideDeactivate(f); + 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.animate({ 'left': '100%' }, 250, function () { SWS.Templates.slideDeactivate(f); + f.css('opacity', '0'); + }); + t.css('opacity', '1'); t.animate({ 'left': '0%' }, 250); }; }; @@ -198,6 +244,43 @@ SWS.Effects = new function () { }; +SWS.Fullscreen = new function () { + var self = this; + + if (SWS.Utils.isUndefined(document.fullScreen)) { + if (SWS.Utils.isUndefined(document.mozfullScreen)) { + self.status = function () { return document.webkitIsFullScreen; }; + self.enter = function(e) { + e.webkitRequestFullScreen(); + }; + self.exit = function () { + document.webkitCancelFullScreen(); + }; + + } else { + self.status = function () { return document.mozfullScreen; }; + self.enter = function(e) { + e.mozRequestFullScreen(); + }; + self.exit = function () { + document.mozCancelFullScreen(); + }; + + }; + } else { + self.status = function () { return document.fullScreen; }; + self.enter = function(e) { + e.requestFullScreen(); + }; + self.exit = function () { + document.cancelFullScreen(); + }; + + }; + + +}; + SWS.Presentation = new function () { @@ -209,9 +292,10 @@ SWS.Presentation = new function () { var _total_slides; var _initialized = false; var _disable_input_events = false; - + var _print_mode = false; var _slide_callbacks = new Array (); - + var _total_steps = -1; + var _current_theme = ""; self.getNumSlides = function () { return _total_slides; }; @@ -223,8 +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 }); @@ -245,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; }; @@ -262,8 +354,10 @@ 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"); SWS.Config['sws-update-header'](to_slide); SWS.Config['sws-update-footer'](to_slide); @@ -280,9 +374,9 @@ SWS.Presentation = new function () { var cur = info.current; var custom = info.custom; - var real_slide = to_slide.children(".sws-slide"); - - real_slide.find("*").andSelf().each(function (i){ + var real_slide = to_slide.find(".sws-slide"); + 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)); @@ -290,19 +384,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 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() { - _disable_input_events = false; + var all = $(from_slide).add(to_slide); + all.find("*").addBack().promise().done(function() { + 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; + }); }); }; @@ -325,6 +420,18 @@ SWS.Presentation = new function () { var infos = canvas.data("sws-frame-info"); return infos; }; + + self.getTotalSteps = function () { + if (_total_steps >= 0) return _total_steps; + _total_steps = 0; + $(".sws-canvas").each(function(i) { + var canvas = $($(".sws-canvas")[i]); + var infos = canvas.data("sws-frame-info"); + _total_steps += infos.last + 1; + }); + return _total_steps; + }; + self.getCurrentFrame = function () { return self.getFrameInfo().current; }; self.setCurrentFrame = function (i) { self.getFrameInfo().current = i; }; self.firstFrame = function () { return 0; }; @@ -369,10 +476,119 @@ SWS.Presentation = new function () { self.refresh(); }; + self.cycleStyle = function() { + var styles = $("head").children('link[rel$="stylesheet"][title]'); + var j = styles.index(styles.filter(':not(:disabled)')); + styles[j].disabled = true; + if (++j == styles.length) j = 0; + styles[j].disabled = false; + }; + + + self.printMode = function () { + _print_mode = true; + var progress = $("
Rendering presentation: %
"); + $("body").append(progress); + + $("html").removeClass("sws-display").addClass("sws-print"); + self.goToSlide(0,0); + var steps = self.getTotalSteps(); + var total_steps = steps; + 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)); + SWS.Config['sws-slide-change'] = SWS.Templates.slideChange; + self.refresh(); + $($(".sws-canvas")[self.getCurrentSlide()]).css('opacity', 1 ); + self.next(); + steps--; + loop(); + }) + } else { + $("#sws-percent-progress").text(100); + progress.remove(); + } + }; + 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(), + '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) { - if (_disable_input_events) return; - switch (event.which) { + if (_disable_input_events || _print_mode) return; + var code = 0; + switch (event.type) { + case 'touchstart': + _xstart = event.changedTouches[0].clientX; + return; + case 'touchend': + + var dist = event.changedTouches[0].clientX - _xstart; + if (dist > 20) code = 37 + else if (dist < -20) code = 39 + else if (!$("#sws-control-panel-canvas").is(":visible")) code = 67; + break; + case 'keydown': + code = event.which; + break; + default: + return; + }; + + switch (code) { case 36:/* Home */ self.setCurrentSlide(self.firstSlide()); break; @@ -380,31 +596,38 @@ SWS.Presentation = new function () { case 35:/* End */ self.setCurrentSlide(self.lastSlide()); break; - case 32: /* space */ + case 34: /* PgDown */ case 39: /* -> */ - + if (self.getCurrentSlide() == self.lastSlide() + && self.getCurrentFrame() == self.lastFrame()) return; self.next(); break; - case 34: /* PgDown */ case 78: /* n */ self.nextSlide(); break; case 8: /* backspace */ + case 33: /* PgUp */ case 37: /* <- */ self.previous(); break; - case 33: /* PgUp */ case 80: /* p */ self.previousSlide(); break; + case 83: /* s */ + self.cycleStyle(); + return; case 67: /* c */ - $("#sws-control-panel").toggle(); + $("#sws-control-panel-canvas").toggle(); + return; + case 72: /* h */ + $("#sws-help-panel-canvas").toggle(); + default: return; }; self.refresh(); - }; +}; @@ -412,7 +635,7 @@ SWS.Presentation = new function () { var cur_frame = 0; var last_frame = canvas.find(".sws-pause").length; //Add all regular elements to the frame list - var slide = $(canvas.children(".sws-slide")[0]); + var slide = $(canvas.find(".sws-slide")[0]); var callbacks = { at_slide : new Array(), at_frame : new Array() } @@ -437,7 +660,7 @@ SWS.Presentation = new function () { } }; - var specials = null; + var specials = $([]); slide.find('*[class*="sws-onframe-"]').each(function(_){ var cls = $(this).attr('class'); @@ -450,12 +673,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)); }); }; }); @@ -470,37 +691,161 @@ SWS.Presentation = new function () { }); canvas.data("sws-frame-info", { current: 0, - last: last_frame, + last: (last_frame - 0), // force cast to integer callbacks: callbacks }); }; - self.init = function () { - console.log("inited"); - $(window).bind('storage', function (e) { - console.log(e); + /* Forces redrawing the page without reloading */ + 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() { + $("html").removeClass("sws-aspect-4-3") + .removeClass("sws-aspect-16-9") + .removeClass("sws-aspect-16-10") + .addClass($("#sws-aspect-select").val()); + 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; + if (typeof name === 'undefined') + 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.title; + if (title == theme_name) { + e.rel = "stylesheet"; + e.disabled = false; + e.media="all"; + } else { + e.rel = "alternate stylesheet"; + e.disabled = true; + e.media="all"; + }; }); + self.redraw(); - _total_slides = $(".sws-slide").length; + }; + + self.openPrint = function () { + window.open ("?mode=print&theme=" + self.getCurrentTheme()); + } + var _fullscreen_icon_on = ""; + var _fullscreen_icon_off = ""; + + self.toggleFullScreen = function () { + if (SWS.Fullscreen.status()) { + SWS.Fullscreen.exit(); + $("a#sws-control-panel-fullscreen") + .html(_fullscreen_icon_off); + + + + } else { + SWS.Fullscreen.enter($("body")[0]); + $("a#sws-control-panel-fullscreen") + .html(_fullscreen_icon_on); + }; + }; + function _update_ui() { + var nav = $('#sws-control-panel-navigation-bar'); + nav.val(SWS.Presentation.getCurrentSlide() + 1); + $('#sws-control-panel-slide-input').val(nav.val()); + } + self.navigate = function () { + self.goToSlide($("#sws-control-panel-navigation-bar").val()-1); + _update_ui(); + }; + + + self.init = 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").add($("body").children("h1")).length; - $(document).keydown(self.inputHandler); - $("body").append($(SWS.Templates.controlPanel)); var cur = self.getCurrentSlide(); - $(".sws-slide").each (function (i) { + var toc = self.buildFullTOC(); + var common_html = "

Plan

"; + $(this).after(this_html); + }); + + $(".sws-slide").each(function (i) { + var par = $(this).parent(); + $(this).remove(); var canvas = $('
'); 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(); - canvas.append($(this)); + content.append($(this)); + inner.append(content); + canvas.append(inner); + if (!($(this).hasClass("sws-option-nofooter"))) { canvas.append($('
')); }; + par.append(canvas); if (i == cur) { @@ -515,10 +860,61 @@ SWS.Presentation = new function () { init_canvas(canvas,_slide_callbacks[i]); }); - _slide_callbacks = null; /* avoid a leak */ - self.refresh(); - _initialized = true; + // 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); + var opt = "