showoff 0.2.1 → 0.2.2

data/lib/showoff.rb

@@ -100,10 +100,16 @@ class ShowOff < Sinatra::Application
         md += "</div>\n"
         md += "</div>\n"
         final += update_commandline_code(md)
+        final = update_p_classes(final)
       end
       final
     end
 
+    # find any lines that start with a <p>.(something) and turn them into <p class="something">
+    def update_p_classes(markdown)
+      markdown.gsub(/<p>\.(.*?) /, '<p class="\1">')
+    end
+
     def update_image_paths(path, slide, static=false)
       paths = path.split('/')
       paths.pop

data/public/css/showoff.css

@@ -145,6 +145,7 @@ h1, h2, h3 {
 
 pre { margin-left: 40px; font-size: 2.8em; }
 
+.notes { display: none }
 .hidden { position:absolute; top:0; left:-9999px; width:1px; height:1px; overflow:hidden; }
 .offscreen { position:absolute; top:0; left:-9999px; overflow:hidden; }
 #debugInfo { margin-left: 30px; }

data/public/js/showoff.js

@@ -177,6 +177,18 @@ function showSlide(back_step) {
     bind('swipeleft',  swipeLeft).
     bind('swiperight', swipeRight)
   removeResults()
+
+  return getCurrentNotes()
+}
+
+function getSlideProgress()
+{
+  return (slidenum + 1) + '/' + slideTotal
+}
+
+function getCurrentNotes() 
+{
+  return currentSlide.find("p.notes").text()
 }
 
 function getSlidePercent()
@@ -204,14 +216,14 @@ function determineIncremental()
 function prevStep()
 {
   slidenum--
-  showSlide(true) // We show the slide fully loaded
+  return showSlide(true) // We show the slide fully loaded
 }
 
 function nextStep()
 {
   if (incrCurr >= incrSteps) {
     slidenum++
-    showSlide()
+    return showSlide()
   } else {
     elem = incrElem.eq(incrCurr)
     if (incrCode && elem.hasClass('command')) {
@@ -225,7 +237,7 @@ function nextStep()
 
 function prevStep() {
   slidenum--
-  showSlide(true) // We show the slide fully loaded
+  return showSlide(true) // We show the slide fully loaded
 }
 
 function doDebugStuff()
@@ -251,7 +263,7 @@ function keyDown(event)
        return true;
 
     debug('keyDown: ' + key)
-
+ 
     if (key >= 48 && key <= 57) // 0 - 9
     {
       gotoSlidenum = gotoSlidenum * 10 + (key - 48);
@@ -304,7 +316,7 @@ function keyDown(event)
     }
     else if (key == 66 || key == 70) // f for footer (also "b" which is what kensington remote "stop" button sends
     {
-      $('#footer').toggle()
+      toggleFooter()
     }
 	else if (key == 27) // esc
 	{
@@ -313,6 +325,11 @@ function keyDown(event)
     return true
 }
 
+function toggleFooter() 
+{
+  $('#footer').toggle()
+}
+
 function keyUp(event) {
   var key = event.keyCode;
   debug('keyUp: ' + key);
@@ -324,11 +341,11 @@ function keyUp(event) {
 
 
 function swipeLeft() {
-  prevStep()
+  nextStep()
 }
 
 function swipeRight() {
-  nextStep()
+  prevStep()
 }
 
 function ListMenu(s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: showoff
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Scott Chacon
@@ -167,7 +167,7 @@ files:
 - public/js/sh_main.min.js
 - public/js/showoff.client.js
 - public/js/showoff.js
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/schacon/showoff
 licenses: []