showoff 0.9.10.4 → 0.9.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cdefcb7407782277dabcbaeb10989d48ee5cafa
-  data.tar.gz: 0fd28be0033c2252c2b10cd6d9258b886d360fa9
+  metadata.gz: df328a48d376bf8e56d3255d9251774ad4f89b2d
+  data.tar.gz: bb8c0990d0438c0081c5b9f3faaeed3cd9f0baa7
 SHA512:
-  metadata.gz: 2a44ba78cfdc72aeaba84b1c890bf923443a3f4de4ee94f3bed25164abb5b9e3d34221384ed6f0fd64e2f1009cad1bd2132ec80a9062532a70115a8799e47a16
-  data.tar.gz: 3e30d8accc301fbff29777316f0595fe73664801b93eae5fb57d13ce29bbf08f5256ebc628a2052bb42be62280b301ad1bc2e5d89af61b527350d7d730ae7915
+  metadata.gz: 41dd46e8e3885a8f8094f5ed9e0fe3af6648b671804a7f4f8b4752d97feb374ae2a806d8898c6c6d2e225f4d4cf96a545679ce7d814f11851631fc6b39ba9c38
+  data.tar.gz: 0f9d52330048ec02b39db8929cc90dbb30a03b327915ebc3c739247ba67121e2fd6946bac649bf3e9a6ce41c63f4180736fafe2b392b0d0669c1d106f9b6f434

data/lib/showoff/version.rb

@@ -1,4 +1,4 @@
 # No namespace here since ShowOff is a class and I'd have to inherit from
 # Sinatra::Application (which we don't want to load here)
-SHOWOFF_VERSION = '0.9.10.4'
+SHOWOFF_VERSION = '0.9.10.5'
 

data/lib/showoff.rb

@@ -930,8 +930,9 @@ class ShowOff < Sinatra::Application
 
 
    def self.do_static(args)
-      what = args[0] || "index"
-      opt  = args[1]
+      args ||= [] # handle nil arguments
+      what   = args[0] || "index"
+      opt    = args[1]
 
       # Sinatra now aliases new to new!
       # https://github.com/sinatra/sinatra/blob/v1.3.3/lib/sinatra/base.rb#L1369

data/public/css/presenter.css

@@ -55,6 +55,11 @@ div.zoomed {
     display: none;
   }
 
+  #topbar #links span.spacer {
+    width: 2em;
+    display: inline-block;
+  }
+
 #center {
   display: -webkit-flex;
   display:         flex;
@@ -289,7 +294,6 @@ div.zoomed {
     height: 100%;
     font-family: helvetica;
     font-weight: 100;
-    padding: 0 0.25em;
   }
   #notes p,
   #notes h1,
@@ -299,13 +303,15 @@ div.zoomed {
   #notes ol,
   #notes ul {
     margin-right: 0.75em;
+    padding-left: 0.25em;
   }
   #notes p {
-    padding: 0.1em inherit;
+    padding: 0.25em;
     margin-bottom: 0.5em;
   }
   #notes ol, #notes ul {
     padding-left: 2em;
+    padding-top: 0.25em;
     margin-bottom: 0.5em;
   }
   #notes ol {

data/public/js/presenter.js

@@ -1,12 +1,13 @@
 // presenter js
 var slaveWindow = null;
 var nextWindow = null;
+var notesWindow = null;
 
 var paceData = [];
 
 $(document).ready(function(){
   // set up the presenter modes
-  mode = { track: true, follow: true, update: true, slave: false, next: false};
+  mode = { track: true, follow: true, update: true, slave: false, next: false, notes: false};
 
   // attempt to open another window for the presentation if the mode defaults
   // to enabling this. It does not by default, so this is likely a no-op.
@@ -42,6 +43,8 @@ $(document).ready(function(){
   // set up tooltips
   $('#report').tipsy({ offset: 5 });
   $('#slaveWindow').tipsy({ offset: 5 });
+  $('#nextWindow').tipsy({ offset: 5 });
+  $('#notesWindow').tipsy({ offset: 5 });
   $('#generatePDF').tipsy({ offset: 5 });
   $('#onePage').tipsy({ offset: 5, gravity: 'ne' });
 
@@ -216,6 +219,36 @@ function openNext()
   }
 }
 
+function toggleNotes() {
+  mode.notes = !mode.notes;
+  openNotes();
+}
+
+function openNotes()
+{
+  if (mode.notes) {
+    try {
+      if(notesWindow == null || typeof(notesWindow) == 'undefined' || notesWindow.closed){
+          notesWindow = window.open('', '', 'width=350,height=450');
+          postSlide();
+      }
+      $('#notesWindow').addClass('enabled');
+    }
+    catch(e) {
+      console.log('Failed to open notes window. Popup blocker?');
+    }
+  }
+  else {
+    try {
+      notesWindow && notesWindow.close();
+      $('#notesWindow').removeClass('enabled');
+    }
+    catch (e) {
+      console.log('Notes window failed to close properly.');
+    }
+  }
+}
+
 function askQuestion(question) {
   $("#questions ul").prepend($('<li/>').text(question));
 
@@ -373,6 +406,9 @@ function postSlide()
 
     var notes = getCurrentNotes();
 		$('#notes').html(notes.html());
+    if (notesWindow) {
+      $(notesWindow.document.body).html(notes.html());
+    }
 
 		var fileName = currentSlide.children().first().attr('ref');
 		$('#slideFile').text(fileName);

data/views/presenter.erb

@@ -41,10 +41,14 @@
         <% if @issues %>
           <a id="report" href="javascript:reportIssue();" title="Report an issue with the current slide.">Report Issue With Slide</a>
         <% end %>
+        <span class="spacer"> </span>
         <a id="stats" href="/stats" target="_showoffchild">Viewing Statistics</a>
         <a id="downloads" href="/download" target="_showoffchild">Downloads</a>
+        <span class="spacer"> </span>
         <a id="slaveWindow" href="javascript:toggleSlave();" title="Enable the slave window.">Slave Window</a>
         <a id="nextWindow" href="javascript:toggleNext();" title="Enable the next window view.">Next Window</a>
+        <a id="notesWindow" href="javascript:toggleNotes();" title="Enable the popout notes window.">Notes Window</a>
+        <span class="spacer"> </span>
         <a id="generatePDF" href="/pdf" title="Call out to wkhtmltopdf to generate a PDF.">Generate PDF</a>
         <a id="onePage" href="/onepage" title="Load the single page view. Useful for printing.">Single Page</a>
       </span>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.9.10.4
+  version: 0.9.10.5
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra