X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=simpleWebSlides.js;h=9beae058907bbd014f7d59d4eca6ed2fea7195fd;hb=c416ce52822fd7c6dfc616b16449cec6eba41062;hp=36325efc601b42f9a59d594469c59668b75538bf;hpb=7d1466e9019cd88bea75191d2896f497d4088d2a;p=hacks%2FsimpleWebSlides.git

diff --git a/simpleWebSlides.js b/simpleWebSlides.js
index 36325ef..9beae05 100644
--- a/simpleWebSlides.js
+++ b/simpleWebSlides.js
@@ -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 ("&", "&")
+				 .replace("'","'")
+				 .replace('"', """)
+				 .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 */
@@ -905,13 +920,12 @@ 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.refresh();
 		};
                 $(document).keydown(self.inputHandler);
                 document.body.addEventListener('touchstart',self.inputHandler, false);
                 document.body.addEventListener('touchend',self.inputHandler, false);
-		
                 _initialized = true;
             };
         setTimeout(f, 100);