.

[hacks/simpleWebSlides.git] / simpleWebSlides.js

diff --git a/simpleWebSlides.js b/simpleWebSlides.js
index 36325ef..798d2ac 100644 (file)
--- a/simpleWebSlides.js
+++ b/simpleWebSlides.js
@@ -77,7 +77,7 @@ SWS.Templates = new function () {
 </div>\
 <div id='sws-control-panel-options'>\
 <span title='Change the aspect ratio' class='sws-symbol' >&#x1f4bb;</span><select id='sws-aspect-select' onchange='SWS.Presentation.changeAspect();'>\
-<option value='sws-aspect-4-3'>4:3</option>\
+<option value='sws-aspect-4-3' selected='selected'>4:3</option>\
 <option value='sws-aspect-16-9'>16:9</option>\
 <option value='sws-aspect-16-10'>16:10</option>\
 </select>\
@@ -513,6 +513,7 @@ SWS.Presentation = new function () {
                 $("#sws-percent-progress").text(100);
                 progress.remove();
                window.status = 'Ready';
+               window.print();
             }
         };
         loop();
@@ -549,7 +550,12 @@ SWS.Presentation = new function () {
 
         var loop = function (doc, dir, add, ignoreFirst) {
             if (ignoreFirst !== true) {
-                var this_toc = { 'title' : doc.find("title").first().text(),
+                var this_toc = { 'title' : doc.find("title").first().text()
+                                .replace ("&", "&amp;")
+                                .replace("'","&apos;")
+                                .replace('"', "&quot;")
+                                .replace("<", "&lt;")
+                                .replace(">", "&gt;"),
                                  'sections' : build_sections(doc) };
                 add(toc, this_toc);
             };
@@ -567,20 +573,25 @@ SWS.Presentation = new function () {
 
 
 
-    var _xstart = 0;
+    var _startTouch = null;
+
     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 (!$("#sws-control-panel-canvas").is(":visible")) 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;
@@ -588,6 +599,7 @@ SWS.Presentation = new function () {
         default:
             return;
         };
+
         switch (code) {
         case 36:/* Home */
             self.setCurrentSlide(self.firstSlide());
@@ -599,6 +611,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();
@@ -609,6 +623,7 @@ SWS.Presentation = new function () {
         case 8: /* backspace */
         case 33: /* PgUp */
         case 37: /* <-   */
+       case 177: /* Multimedia skip backward */
             self.previous();
             break;
         case 80: /* p */
@@ -707,10 +722,23 @@ SWS.Presentation = new function () {
             });
     };
     self.changeAspect = function() {
+       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";
+       console.log(byClass);
+
+       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();
     };
 
@@ -905,16 +933,18 @@ SWS.Presentation = new function () {
                     self.printMode();
                 }
                 else {
-                   if (self.showHelpAtStartup()) $("#sws-help-panel-canvas").show();
+                   if (self.showHelpAtStartup()) $("#sws-help-panel-canvas").show().delay(5000).hide();
+                   self.changeAspect();
                     self.refresh();
                };
                 $(document).keydown(self.inputHandler);
                 document.body.addEventListener('touchstart',self.inputHandler, false);
                 document.body.addEventListener('touchend',self.inputHandler, false);
-               
+               $(window).resize(self.changeAspect);
                 _initialized = true;
             };
-        setTimeout(f, 100);
+        //setTimeout(f, 100);
+       f();
     };
 
 };