X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=simpleWebSlides.js;h=e73a1a2252cab4d7b0d49490230afe3b7d0557c2;hb=aa50324ee6e5bf764099971072c3eb6e50443247;hp=10d5d03025d91db4bdf8c4a8be931acdb5e65e24;hpb=84e2c90ea8d41d08c996bd84bd459ba5ad23de0b;p=hacks%2FsimpleWebSlides.git diff --git a/simpleWebSlides.js b/simpleWebSlides.js index 10d5d03..e73a1a2 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,32 @@ SWS.Utils = new function () { SWS.Templates = new function () { var self = this; - self.controlPanel = "
\ -◀◀◀\ -◀◀ \ -◀\ -▶\ -▶▶\ -▶▶▶\ + self.controlPanel = "
\ +
\ +\ +✖\ +
\ +
\ +💻\ +🎨\ +\ +
\ +
\ +⏮\ +⏪\ +▶\ +▶\ +⏩\ +⏭\ +
\ +\ +\ +
\ +
\
"; self.slideActivate = function (o) { if (!(o.hasClass("sws-active-slide"))){ @@ -81,7 +105,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; @@ -130,7 +153,10 @@ SWS.Effects = new function () { self.objectDeactivateFadeOut = function (o) { o.animate({'opacity': '0'}, 200, - function () { SWS.Templates.objectDeactivate(o)}); + function () { + + SWS.Templates.objectDeactivate(o); + }); }; self.objectActivateFadeIn = function (o) { @@ -168,13 +194,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 +230,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 +278,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; }; @@ -262,8 +332,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,7 +352,7 @@ SWS.Presentation = new function () { var cur = info.current; var custom = info.custom; - var real_slide = to_slide.children(".sws-slide"); + var real_slide = to_slide.find(".sws-slide"); real_slide.find("*").andSelf().each(function (i){ var frameset = $(this).data("sws-frame-set") || {}; @@ -296,12 +368,8 @@ SWS.Presentation = new function () { 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() { + var all = $(from_slide).add(to_slide); + all.find("*").addBack().promise().done(function() { _disable_input_events = false; }); }; @@ -325,6 +393,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; }; @@ -377,8 +457,44 @@ SWS.Presentation = new function () { 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; + console.log(percent); + $("#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.inputHandler = function (event) { - if (_disable_input_events) return; + if (_disable_input_events || _print_mode ) return; + switch (event.which) { case 36:/* Home */ self.setCurrentSlide(self.firstSlide()); @@ -387,21 +503,21 @@ 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; @@ -409,7 +525,8 @@ SWS.Presentation = new function () { self.cycleStyle(); return; case 67: /* c */ - $("#sws-control-panel").toggle(); + $("#sws-control-panel-canvas").toggle(); + default: return; }; @@ -422,7 +539,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() } @@ -480,37 +597,134 @@ 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(); + + }; + + 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); + + _total_slides = $(".sws-slide").length; - $(document).keydown(self.inputHandler); - $("body").append($(SWS.Templates.controlPanel)); var cur = self.getCurrentSlide(); - $(".sws-slide").each (function (i) { + + $(".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) { @@ -525,10 +739,55 @@ 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)); + // Fill the theme switcher + $("link.sws-theme").each (function (i) { + var e = $(this); + var opt = "