Fix various issues.

diff --git a/simpleWebSlides.css b/simpleWebSlides.css
index 2caa258..e7dcb60 100644 (file)
--- a/simpleWebSlides.css
+++ b/simpleWebSlides.css
@@ -48,7 +48,7 @@
         visibility:visible;
         opacity:1.0;
     }
-    .sws-canvas:last {
+    .sws-canvas:last-child {
         page-break-after: avoid;
     }
     .sws-active-slide, .sws-inactive-slide {
@@ -125,7 +125,7 @@ body > h1, body > h2, body > h3 {
 }
 
 @media print {
-    sws-control-panel {
+    #sws-control-panel {
         display: none;
-    };
-}
\ No newline at end of file
+    }
+}

diff --git a/simpleWebSlides.js b/simpleWebSlides.js
index 9993a51..c7172d9 100644 (file)
--- a/simpleWebSlides.js
+++ b/simpleWebSlides.js
@@ -103,7 +103,7 @@ SWS.Templates = new function () {
                          + (i + 1)
                          +"</span>");
             var sep = $( "<span class='sws-slide-num-sep' />");
-            var tot = $( "<span class='sws-current-slide-number'>"
+            var tot = $( "<span class='sws-last-slide-number'>"
                          + (SWS.Presentation.getNumSlides())
                          +"</span>");
             footer.append(cur).append(sep).append(tot);
@@ -265,12 +265,13 @@ SWS.Presentation = new function () {
         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);
+
         if (slide_change) {
             //Launch a slide transition:
             SWS.Config['sws-slide-change'](from_slide_num, to_slide_num);
             watch_slide_anim = true;
-            SWS.Config['sws-update-header'](to_slide);
-            SWS.Config['sws-update-footer'](to_slide);
             for (var i = 0; i < info.callbacks.at_slide.length;i++){
                 info.callbacks.at_slide[i](to_slide);
             };
@@ -281,7 +282,7 @@ SWS.Presentation = new function () {
         var custom = info.custom;
         var real_slide = to_slide.children(".sws-slide");
 
-        to_slide.children(".sws-slide").find("*").andSelf().each(function (i){
+        real_slide.find("*").andSelf().each(function (i){
             var frameset = $(this).data("sws-frame-set") || {};
             if (frameset[cur])
                 SWS.Config['sws-object-activate']($(this));
@@ -308,11 +309,13 @@ SWS.Presentation = new function () {
     self.nextSlide = function () {
         self.setCurrentSlide(Math.min(self.getCurrentSlide()+1,
                                       self.lastSlide()));
+        self.setCurrentFrame(self.firstFrame());
     };
 
     self.previousSlide = function () {
         self.setCurrentSlide(Math.max(self.getCurrentSlide()-1,
                                       self.firstSlide()));
+        self.setCurrentFrame(self.firstFrame());
     };
 
     self.getFrameInfo = function () {
@@ -339,9 +342,10 @@ SWS.Presentation = new function () {
 
     self.next = function () {
         var i = self.getCurrentFrame();
-        if (i == self.lastFrame())
+        if (i == self.lastFrame()) {
             self.nextSlide();
-        else
+            self.setCurrentFrame(self.firstFrame());
+        } else
             self.nextFrame();
     };
 
@@ -360,7 +364,7 @@ SWS.Presentation = new function () {
             f = 0;
         if (!(s >= self.firstSlide() && s <= self.lastSlide())) return;
         self.setCurrentSlide(s);
-        if (!(f >= self.firstFrame() && s <= self.lastFrame())) f = 0;
+        if (!(f >= self.firstFrame() && f <= self.lastFrame())) f = 0;
         self.setCurrentFrame(f);
         self.refresh();
     };
@@ -502,7 +506,7 @@ SWS.Presentation = new function () {
             if (i == cur) {
                 canvas
                     .addClass("sws-active-slide")
-                    .removeClass("sws-inacitve-slide");
+                    .removeClass("sws-inactive-slide");
             } else {
                 canvas
                     .addClass("sws-inactive-slide")

diff --git a/themes/default.css b/themes/default.css
index 552b752..584cba4 100644 (file)
--- a/themes/default.css
+++ b/themes/default.css
@@ -23,9 +23,7 @@ body {
 
 /* slide title */
 .sws-slide h1 {
-    font-size: xxx-large;
     font-weight: bolder;
-
 }
 
 span.sws-slide-num-sep:after {
@@ -37,13 +35,3 @@ span.sws-slide-num-sep:after {
 .alert {
     color: red;
 }
-
-/* Simple transition in presentation mode */
-@media screen {
-    .sws-inactive-slide {
-        visibility: hidden;
-    }
-    .sws-current-slide {
-        visibility: visible;
-    }
-}
\ No newline at end of file

diff --git a/themes/webTwoPointO.css b/themes/webTwoPointO.css
index 9f8cecb..0403851 100644 (file)
--- a/themes/webTwoPointO.css
+++ b/themes/webTwoPointO.css
@@ -5,7 +5,7 @@ body {
     font-family: 'Armata',sans-serif;
     font-size: 18pt;
 }
-code {
+code, pre, tt {
     font-family: 'Inconsolata', monospace;
 }
 
@@ -74,7 +74,6 @@ ul {
 
 /* slide title */
 .sws-slide h1 {
-    font-size: xxx-large;
     font-weight: bolder;
     text-align: center;
 }