showoff 0.9.7 → 0.9.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b74b0bccf334e9ec1cc0d1f63e78920dbb09ac7
-  data.tar.gz: 6821752697b1c41013d5723ac3be01b4e6d8a30b
+  metadata.gz: 756658ffcc3440e126ed64c256a82ed7f188d1e0
+  data.tar.gz: 6558c0816fe2ee1c4bfe1b18bf228b70f708a87e
 SHA512:
-  metadata.gz: 4fe62f61ad47dcf4718b1c33229d2c10b9367d9ed2f823338876279924506bf441296308f8b8f382823764747d1dfb0121baf6b9fc5307424728a199655b0779
-  data.tar.gz: 3756465ce5712780bd916c1eff7f54bcfe47928f6f67bbcaa93fc5c38ff712a392e4997936dd8549efde0ac718d6cb8171226bfd627056f9c22315493dc2f845
+  metadata.gz: 2fe546cdf496d75232a11593820ef1070c66f4089598aaf9c9679d2f593446e0b47df3e6b08815180d21edac570e4f9e517ce28bb27277d26d8520d757eab551
+  data.tar.gz: f6d1c58f94860d0f31982f91f3a64687fd80709a93f982a0c32a925a1189ecdf0ca6cfb773acb16495191d061e21f84762df78a0171efeb3769e13135a0cd6da

data/lib/showoff.rb

@@ -682,7 +682,9 @@ class ShowOff < Sinatra::Application
       @all = Hash.new
       @@counter.each do |slide, stats|
         @all[slide] = 0
-        stats.map { |host, count| @all[slide] += count }
+        stats.map do |host, visits|
+          visits.each { |entry| @all[slide] += entry['elapsed'].to_f }
+        end
       end
 
       # most and least five viewed slides
@@ -902,7 +904,7 @@ class ShowOff < Sinatra::Application
               # a bucket of slideviews for this address
               @@counter[slide][remote] ||= Array.new
               # and add this slide viewing to the bucket
-              @@counter[slide][remote] << { :elapsed => time, :timestamp => Time.now.to_i, :presenter => @@current[:name] }
+              @@counter[slide][remote] << { 'elapsed' => time, 'timestamp' => Time.now.to_i, 'presenter' => @@current[:name] }
 
             when 'position'
               ws.send( { 'current' => @@current[:number] }.to_json ) unless @@cookie.nil?

data/lib/showoff/version.rb

@@ -1,3 +1,3 @@
 # 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.7'
+SHOWOFF_VERSION = '0.9.7.1'

data/public/css/presenter.css

@@ -45,6 +45,10 @@ div.zoomed {
     background-color: #555;
   }
 
+  #topbar #links a.enabled {
+    background-color: #003d96;
+  }
+
   #topbar #links .mobile {
     display: none;
   }

data/public/js/presenter.js

@@ -4,9 +4,11 @@ var slaveWindow = null;
 var paceData = [];
 
 $(document).ready(function(){
-  // attempt to open another window for the presentation. This may fail if
-  // popup blockers are enabled. In that case, the presenter needs to manually
-  // open the window by hitting the 'slave window' button.
+  // set up the presenter modes
+  mode = { track: false, follow: true, update: true, slave: 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.
   openSlave();
 
   // the presenter window doesn't need the reload on resize bit
@@ -60,9 +62,6 @@ $(document).ready(function(){
     bind('swipeleft', presNextStep).  // next
     bind('swiperight', presPrevStep); // prev
 
-  // set up the presenter modes
-  mode = { track: false, follow: true, update: true };
-
   $('#remoteToggle').change( toggleFollower );
   $('#followerToggle').change( toggleUpdater );
 
@@ -110,28 +109,46 @@ function reportIssue() {
   window.open(link);
 }
 
+function toggleSlave() {
+  mode.slave = !mode.slave;
+  openSlave();
+}
+
 function openSlave()
 {
-  try {
-    if(slaveWindow == null || typeof(slaveWindow) == 'undefined' || slaveWindow.closed){
-        slaveWindow = window.open('/' + window.location.hash);
+  if (mode.slave) {
+    try {
+      if(slaveWindow == null || typeof(slaveWindow) == 'undefined' || slaveWindow.closed){
+          slaveWindow = window.open('/' + window.location.hash, 'toolbar');
+      }
+      else if(slaveWindow.location.hash != window.location.hash) {
+        // maybe we need to reset content?
+        slaveWindow.location.href = '/' + window.location.hash;
+      }
+
+      // maintain the pointer back to the parent.
+      slaveWindow.presenterView = window;
+      slaveWindow.mode = { track: false, slave: true, follow: false };
+
+      $('#slaveWindow').addClass('enabled');
     }
-    else if(slaveWindow.location.hash != window.location.hash) {
-      // maybe we need to reset content?
-      slaveWindow.location.href = '/' + window.location.hash;
+    catch(e) {
+      console.log('Failed to open or connect slave window. Popup blocker?');
     }
 
-    // maintain the pointer back to the parent.
-    slaveWindow.presenterView = window;
-    slaveWindow.mode = { track: false, slave: true, follow: false };
-  }
-  catch(e) {
-    console.log('Failed to open or connect slave window. Popup blocker?');
+    // Set up a maintenance loop to keep the connection between windows. I wish there were a cleaner way to do this.
+    if (typeof maintainSlave == 'undefined') {
+      maintainSlave = setInterval(openSlave, 1000);
+    }
   }
-
-  // Set up a maintenance loop to keep the connection between windows. I wish there were a cleaner way to do this.
-  if (typeof maintainSlave == 'undefined') {
-    maintainSlave = setInterval(openSlave, 1000);
+  else {
+    try {
+      slaveWindow && slaveWindow.close();
+      $('#slaveWindow').removeClass('enabled');
+    }
+    catch (e) {
+      console.log('Slave window failed to close properly.');
+    }
   }
 }
 

data/public/js/sh_lang/sh_puppet.js

@@ -34,7 +34,7 @@ sh_languages['puppet'] = [
       3
     ],
     [
-      /\/[^\n]*\//g,
+      /\/[^\n]*\/\s/g,  // anchor to \s to avoid matching directory names.
       'sh_regexp',
       -1
     ],

data/public/js/sh_lang/sh_puppet.min.js

@@ -34,7 +34,7 @@ sh_languages['puppet'] = [
       3
     ],
     [
-      /\/[^\n]*\//g,
+      /\/[^\n]*\/\s/g,  // anchor to \s to avoid matching directory names.
       'sh_regexp',
       -1
     ],

data/views/presenter.erb

@@ -38,7 +38,7 @@
         <% end %>
         <a id="stats" href="/stats" target="_showoffchild">Viewing Statistics</a>
         <a id="downloads" href="/download" target="_showoffchild">Downloads</a>
-        <a id="slaveWindow" href="javascript:openSlave();" title="Open a slave window if your popup blocker prevented it.">Open Slave Window</a>
+        <a id="slaveWindow" href="javascript:toggleSlave();" title="Enable the slave window.">Enable Slave Window</a>
         <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.7
+  version: 0.9.7.1
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra