showoff 0.19.3 → 0.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a66af4fa19b9d002a82e7462e0ff2c12d744396
-  data.tar.gz: 0c16695b14e89667f5c87bbb14b29f7959bc54bd
+  metadata.gz: a2e85b3d4cb3a4ca82c5534fd4b927092f3f3644
+  data.tar.gz: 7db65a31bb8715347d29cad31126b289580c6dd0
 SHA512:
-  metadata.gz: a1dad721827fc36f22b2543b21ec3affe9979b38719dc150df31b1b348134fdc524684cec211936a83aa5b8b99c65c97b00787461e8f5988e39e3f7db870d3e2
-  data.tar.gz: fcc295154155d5f098be51a0d7e28fb7e686d042567a6ca7f509edf21d0ac8bbb82269e3f2384c1e65d5bf0d6acc28f3995ae1bdbfbd879f9acc4fa6424e6717
+  metadata.gz: e1eb97c5ad914d5a80335e0787a6672b031aa051d0ec0761f6d7ff345dc8fbdcd92c7504b81765b587b4caeb24926a0e61f93e33a95bf82e3a9c2408d087c39d
+  data.tar.gz: cae2c69158bb9c9fd86b9169ed6c1a802ee779ffc7171aa66f835df4025c6cba6892b447e8d1c91334b781458d43a626716343788ad9dd0a85bc2576f53200be

data/lib/keymap.rb

@@ -5,10 +5,10 @@ module Keymap
       'd'           => 'DEBUG',
       'up'          => 'PREV',
       'left'        => 'PREV',
-      'pageup'      => 'PREV',
+      'pageup'      => 'PREVSEC',
       'down'        => 'NEXT',
       'right'       => 'NEXT',
-      'pagedown'    => 'NEXT',
+      'pagedown'    => 'NEXTSEC',
       'R'           => 'RELOAD',
       'r'           => 'REFRESH',
       'c'           => 'CONTENTS',

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.19.3'
+SHOWOFF_VERSION = '0.19.4'

data/locales/de.yml

@@ -76,6 +76,8 @@ de:
     title: Hilfe
     next: Zur nächsten Folie.
     prev: Zur vorherigen Folie.
+    nextsec: Zur nächsten Sektion.
+    prevsec: Zur vorherigen Sektion.
     contents: Anzeigen des Inhaltsverzeichnisses.
     follow: Mitverfolgen ein/aussschalten.
     help: Anzeigen der Hilfe.

data/locales/en.yml

@@ -77,6 +77,8 @@ en:
     title: Help
     next: Move to the next slide.
     prev: Move to the previous slide.
+    nextsec: Move to the next section.
+    prevsec: Move to the previous section.
     contents: Show the table of contents menu.
     follow: Toggle follow mode.
     help: Show this help dialog.

data/locales/es.yml

@@ -77,6 +77,8 @@ es:
     title: Ayuda
     next: Mover a la siguiente diapositiva.
     prev: Mover a la diapositiva anterior.
+    nextsec: Mover a la siguiente sección.
+    prevsec: Mover a la sección anterior.
     contents: Mostrar el menú de la tabla de contenidos.
     follow: Habilitar el modo de seguimiento.
     help: Mostrar éste dialogo de ayuda.

data/locales/fr.yml

@@ -76,6 +76,8 @@ fr:
     title: Aider
     next: Passer à la diapositive suivante.
     prev: Passer à la diapositive précédente.
+    nextsec: Passer à la section suivante.
+    prevsec: Passer à la section précédente.
     contents: Afficher le menu de la table des matières.
     follow: Activer le mode de suivi.
     help: Afficher cette fenêtre d'aide.

data/locales/id.yml

@@ -0,0 +1,2 @@
+id:
+  name: Showoff Presentation

data/locales/ja.yml

@@ -77,6 +77,8 @@ ja:
     title: ヘルプ
     next: 次のスライドに移動します。
     prev: 前のスライドに移動します。
+    nextsec: 次のセクションに移動します。
+    prevsec: 前のセクションに移動します。
     contents: 目次メニュを表示する。
     follow: フォローモードを切り替えます。
     help: このヘルプダイアログを表示します。

data/locales/nl.yml

@@ -76,6 +76,8 @@ nl:
     title: Help
     next: Ga naar de volgende slide.
     prev: Ga naar de vorige slide.
+    nextsec: Ga naar de volgende deel.
+    prevsec: Ga naar de vorige deel.
     contents: Toon de inhoudsopgave.
     follow: Schakel volgmodus in.
     help: Toon dit scherm.

data/locales/pt.yml

@@ -76,6 +76,8 @@ pt:
     title: Ajuda
     next: Ir para o próximo slide.
     prev: Ir para o slide anterior.
+    nextsec: Ir para a próxima seção.
+    prevsec: Ir para a seção anterior.
     contents: Mostrar o Índice.
     follow: Alternar modo seguidor.
     help: Mostrar esta ajuda.

data/public/js/presenter.js

@@ -688,6 +688,26 @@ function presNextStep()
 	update();
 }
 
+function presPrevSec()
+{
+  prevSec();
+  try { slaveWindow.prevSec(false) } catch (e) {};
+  try { nextWindow.gotoSlide(nextSlideNum()) } catch (e) {};
+  postSlide();
+
+  update();
+}
+
+function presNextSec()
+{
+  nextSec();
+  try { slaveWindow.nextSec(false) } catch (e) {};
+  try { nextWindow.gotoSlide(nextSlideNum()) } catch (e) {};
+  postSlide();
+
+  update();
+}
+
 function postSlide() {
 	if(currentSlide) {
     // clear out any existing rendered forms
@@ -773,7 +793,9 @@ function presenterKeyDown(event){
   switch(getAction(event)) {
     case 'DEBUG':     toggleDebug();      break;
     case 'PREV':      presPrevStep();     break; // Watch that this uses presPrevStep and not prevStep
+    case 'PREVSEC':   presPrevSec();      break; // Same here
     case 'NEXT':      presNextStep();     break; // Same here
+    case 'NEXTSEC':   presNextSec();      break; // Same here
     case 'REFRESH':   reloadSlides();     break;
     case 'RELOAD':    reloadSlides(true); break;
     case 'CONTENTS':  toggleContents();   break;

data/public/js/showoff.js

@@ -615,6 +615,7 @@ function clearCookies() {
   document.cookie = "layout=;expires=Thu, 21 Sep 1979 00:00:01 UTC;";
   document.cookie = "notes=;expires=Thu, 21 Sep 1979 00:00:01 UTC;";
   document.cookie = "tourVersion=;expires=Thu, 21 Sep 1979 00:00:01 UTC;";
+  document.cookie = "presenter=;expires=Thu, 21 Sep 1979 00:00:01 UTC;";
   document.cookieHash = {};
 }
 
@@ -745,6 +746,16 @@ function currentSlideFromName(name) {
   	    found = count;
   	    return false;
   	  }
+      var dataSection = $(slide).attr("data-section").toLowerCase();
+      // firstText is usually a header for the slide
+      var firstText = $(slide).find(".content :first").text().replace(/[\W]+/g, '-').replace(/-+$/, '').toLowerCase();
+      var decodedName = decodeURIComponent(name).toLowerCase();
+      if (decodedName == dataSection+'/'+firstText
+          || name == dataSection
+          || decodedName == firstText  ) {
+        found = count;
+        return false;
+      }
   	  count++;
   	});
 	}
@@ -1554,6 +1565,34 @@ function nextStep(updatepv)
   }
 }
 
+function prevSec(updatepv)
+{
+  $(currentSlide).find('video').each(function() {
+    console.log('Pausing videos on ' + currentSlide.attr('id'))
+    $(this).get(0).pause();
+  });
+
+  var curSec = currentSlide.attr('data-section');
+  var prevSec = $('li:has(a.navSection:contains('+curSec+'))')
+        .prev('li').find('ul li a:first').attr('rel');
+  gotoSlide(prevSec);
+  track();
+}
+
+function nextSec(updatepv)
+{
+  $(currentSlide).find('video').each(function() {
+    console.log('Pausing videos on ' + currentSlide.attr('id'))
+    $(this).get(0).pause();
+  });
+
+  var curSec = currentSlide.attr('data-section');
+  var nextSec = $('li:has(a.navSection:contains('+curSec+'))')
+        .next('li').find('ul li a:first').attr('rel');
+  gotoSlide(nextSec);
+  track();
+}
+
 // carrying on our grand tradition of overwriting functions of the same name with presenter.js
 function postSlide() {
 	if(currentSlide) {
@@ -1658,7 +1697,9 @@ function keyDown(event){
   switch(getAction(event)) {
     case 'DEBUG':     toggleDebug();      break;
     case 'PREV':      prevStep();         break;
+    case 'PREVSEC':   prevSec();          break;
     case 'NEXT':      nextStep();         break;
+    case 'NEXTSEC':   nextSec();          break;
     case 'REFRESH':   reloadSlides();     break;
     case 'RELOAD':    reloadSlides(true); break;
     case 'CONTENTS':  toggleContents();   break;

data/public/js/simpleStrings-0.0.1.js

@@ -2,14 +2,14 @@
     var translations = {
       en: {
         'greeting': 'Hello there!',
-        'farewell': "Goodbye.'
+        'farewell': 'Goodbye.'
       },
       fr: {
         'greeting': 'Bonjour!',
-        'farewell': "Au revoir.'}.
+        'farewell': 'Au revoir.'},
       es: {
         'greeting': 'Hola!',
-        'farewell': "Adios amigo.'
+        'farewell': 'Adios amigo.'
       }
     };
 
@@ -29,19 +29,41 @@
         strings: {}
       }, options );
 
-      function translate(item) {
-        item = $(item);
-        var text = item.text();
+      // look up from the translation table using dot notation
+      // returns undefined on miss
+      function lookup(keyword) {
+        return keyword.split('.').reduce(function(obj, key){
+          if(obj != undefined) { return obj[key] }
+        }, settings.strings);
+      }
 
-        if(matches = text.match(/^{{(.*)}}$/) ) {
-          keyword = matches[1];
+      function interpolate(text) {
+        var tokens  = [];
+        var pattern = /{{([^}]+)}}/g
+        while (item = pattern.exec(text)) { tokens.push(item[1] ) };
 
-          if(keyword in settings.strings) {
-            item.text(settings.strings[keyword]);
+        tokens.forEach(function(keyword){
+          if(translation = lookup(keyword)) {
+            text = text.replace('{{'+keyword+'}}', translation);
           }
-        }
+        });
 
-        return item;
+        return text;
+      }
+
+      function translate(item) {
+        // iterate through nodes contained in this element, including plain text nodes and other elements
+        return $(item).contents()
+          .each(function() {
+            if(this.nodeType == 3) {
+              // translate directly if it's text
+              this.replaceWith(interpolate(this.textContent));
+            }
+            else {
+              // otherwise recurse inside and try again
+              translate(this);
+            }
+          });
       }
 
       function inline_svg(img, callback) {

data/views/header.erb

@@ -53,6 +53,7 @@
     editUrl     = "<%= @edit %>";
     interactive = <%= @interactive %>;
     master      = <%= master_presenter? %>;
+    presenter   = <%= valid_presenter_cookie? %>;
 
     keymap               = <%= JSON.pretty_generate @keymap %>;
     keycode_dictionary   = <%= JSON.pretty_generate @keycode_dictionary %>;

data/views/help.erb

@@ -10,6 +10,16 @@
       <span class="action">PREV</span>
       <span class="hotkeys"><%= mapped_keys('PREV') %></span>
     </div>
+    <div>
+      <span class="description"><%= I18n.t('help.nextsec') %></span>
+      <span class="action">NEXTSEC</span>
+      <span class="hotkeys"><%= mapped_keys('NEXTSEC') %></span>
+    </div>
+    <div>
+      <span class="description"><%= I18n.t('help.prevsec') %></span>
+      <span class="action">PREVSEC</span>
+      <span class="hotkeys"><%= mapped_keys('PREVSEC') %></span>
+    </div>
     <div>
       <span class="description"><%= I18n.t('help.contents') %></span>
       <span class="action">CONTENTS</span>

data/views/index.erb

@@ -10,6 +10,10 @@
     var autoTour = true;
 
     $( document ).ready(function() {
+      if(presenter && !window.opener) {
+        alert('This is an audience view designed for interactivity. If you are placing this window on a projector, you should use the Display View instead.');
+      }
+
       tours['showoff:activity'] = [
         {
           element: ".currentSlide .activityToggle",
@@ -73,7 +77,7 @@
     <hr>
 
     <% if @feedback and not @static then %>
-    <p><%= I18n.t('menu.pace.label') %></p>            
+    <p><%= I18n.t('menu.pace.label') %></p>
     <div id="paceWrapper">
       <div id="paceSlower" class="buttonWrapper interactive">
         <i class="fa fa-minus"></i>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.4
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -265,6 +265,7 @@ files:
 - locales/en.yml
 - locales/es.yml
 - locales/fr.yml
+- locales/id.yml
 - locales/ja.yml
 - locales/nl.yml
 - locales/pt.yml