RubyGems - showoff - Versions diffs - 0.19.4 → 0.19.6 - Mend

showoff 0.19.4 → 0.19.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2e85b3d4cb3a4ca82c5534fd4b927092f3f3644
-  data.tar.gz: 7db65a31bb8715347d29cad31126b289580c6dd0
+  metadata.gz: e7d89a81580e427dec3aeac374f270da7d41086f
+  data.tar.gz: 05d8ae0e8cc50901278c78b9a4863aca8229dece
 SHA512:
-  metadata.gz: e1eb97c5ad914d5a80335e0787a6672b031aa051d0ec0761f6d7ff345dc8fbdcd92c7504b81765b587b4caeb24926a0e61f93e33a95bf82e3a9c2408d087c39d
-  data.tar.gz: cae2c69158bb9c9fd86b9169ed6c1a802ee779ffc7171aa66f835df4025c6cba6892b447e8d1c91334b781458d43a626716343788ad9dd0a85bc2576f53200be
+  metadata.gz: 2ef1768cbda7e7162c7a0002be3d05c6b7ac8ef4853daa05d0b7f141bd778c2820326538318d2cab87288a4b2a3fa0572989504ac4e05a2d291abfe5a5227415
+  data.tar.gz: 0d005aa1173803fb79356db0cd0f882c2f493f071931ff48a9ddcd79791cc9884fbd702ce5026d63c9a97b2ab0bbcc5e06211bdc0a6f147f81d9d7f32dce78aa

data/lib/keymap.rb CHANGED

@@ -1,14 +1,21 @@
 module Keymap
   def self.default()
     {
-      'space'       => 'NEXT',
       'd'           => 'DEBUG',
-      'up'          => 'PREV',
-      'left'        => 'PREV',
-      'pageup'      => 'PREVSEC',
+      'space'       => 'NEXT',
       'down'        => 'NEXT',
       'right'       => 'NEXT',
-      'pagedown'    => 'NEXTSEC',
+      'pagedown'    => 'NEXT',
+      'up'          => 'PREV',
+      'left'        => 'PREV',
+      'pageup'      => 'PREV',
+      'SPACE'       => 'NEXTSEC',
+      'DOWN'        => 'NEXTSEC',
+      'RIGHT'       => 'NEXTSEC',
+      'PAGEDOWN'    => 'NEXTSEC',
+      'UP'          => 'PREVSEC',
+      'LEFT'        => 'PREVSEC',
+      'PAGEUP'      => 'PREVSEC',
       'R'           => 'RELOAD',
       'r'           => 'REFRESH',
       'c'           => 'CONTENTS',
@@ -169,6 +176,13 @@ module Keymap
       "`"           => "~",
       "="           => "+",
       "-"           => "_",
+      "space"       => "SPACE",
+      "down"        => "DOWN",
+      "right"       => "RIGHT",
+      "pagedown"    => "PAGEDOWN",
+      "up"          => "UP",
+      "left"        => "LEFT",
+      "pageup"      => "PAGEUP",
     }
   end

data/lib/showoff.rb CHANGED

@@ -506,6 +506,7 @@ class ShowOff < Sinatra::Application
         # Apply the template to the slide and replace the key to generate the content of the slide
         sl = process_content_for_replacements(template.gsub(/~~~CONTENT~~~/, slide.text))
+        sl = process_content_for_language(sl, I18n.locale)
         sl = Tilt[:markdown].new(nil, nil, @engine_options) { sl }.render
         sl = build_forms(sl, content_classes)
         sl = update_p_classes(sl)
@@ -535,6 +536,21 @@ class ShowOff < Sinatra::Application
       final
     end
+    def process_content_for_language(content, locale)
+        lang = locale.to_s.split('-').first
+        result = content
+        content.scan(/^((~~~LANG:([\w-]+)~~~\n)(.+?)(\n~~~ENDLANG~~~\n))/m).each do |match|
+            if match[2] == lang or match[2] == locale.to_s
+                result.sub!(match[0], match[3])
+            else
+                result.sub!(match[0], "\n")
+            end
+        end
+        result
+    end
     # This method processes the content of the slide and replaces
     # content markers with their actual value information
     def process_content_for_replacements(content)

data/lib/showoff/version.rb CHANGED

@@ -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.4'
+SHOWOFF_VERSION = '0.19.6'

data/views/index.erb CHANGED

@@ -3,60 +3,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <%= erb :header %>
-  <script type="text/javascript">
-    // We want the audience members to see automatic tours. We can assume that they won't be
-    // using many server domains like the presenter might.
-    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",
-          intro: I18n.t('tour.activity.complete')
-        }
-      ];
-      tours['showoff:form'] = [
-        {
-          element: ".currentSlide input.save",
-          intro: I18n.t('tour.form.save')
-        }
-      ];
-      tours['showoff:menu'] = [
-        {
-          element: "#hamburger",
-          intro: I18n.t('tour.menu.start')
-        },
-        {
-          element: "#navToggle",
-          intro: I18n.t('tour.menu.navigation')
-        },
-        {
-          element: "#fileDownloads",
-          intro: I18n.t('tour.menu.download')
-        },
-        {
-          element: "#paceFaster",
-          intro: I18n.t('tour.menu.pace')
-        },
-        {
-          element: "#questionToggle",
-          intro: I18n.t('tour.menu.questions')
-        },
-        {
-          element: "#feedbackToggle",
-          intro: I18n.t('tour.menu.feedback')
-        }
-      ].filter(function(item) { return (document.querySelector(item['element'])) });
-      // display tips for only the enabled features
-    });
-  </script>
 </head>
 <body>
@@ -175,5 +121,59 @@
   <%= @pause_msg %>
 </div>
+  <script defer type="text/javascript">
+    // We want the audience members to see automatic tours. We can assume that they won't be
+    // using many server domains like the presenter might.
+    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",
+          intro: I18n.t('tour.activity.complete')
+        }
+      ];
+      tours['showoff:form'] = [
+        {
+          element: ".currentSlide input.save",
+          intro: I18n.t('tour.form.save')
+        }
+      ];
+      tours['showoff:menu'] = [
+        {
+          element: "#hamburger",
+          intro: I18n.t('tour.menu.start')
+        },
+        {
+          element: "#navToggle",
+          intro: I18n.t('tour.menu.navigation')
+        },
+        {
+          element: "#fileDownloads",
+          intro: I18n.t('tour.menu.download')
+        },
+        {
+          element: "#paceFaster",
+          intro: I18n.t('tour.menu.pace')
+        },
+        {
+          element: "#questionToggle",
+          intro: I18n.t('tour.menu.questions')
+        },
+        {
+          element: "#feedbackToggle",
+          intro: I18n.t('tour.menu.feedback')
+        }
+      ].filter(function(item) { return (document.querySelector(item['element'])) });
+      // display tips for only the enabled features
+    });
+  </script>
 </body>
 </html>

data/views/presenter.erb CHANGED

@@ -8,117 +8,6 @@
   <script type="text/javascript" src="<%= @asset_path %>/js/TimeCircles-89ac5ae.js"></script>
   <script type="text/javascript" src="<%= @asset_path %>/js/presenter.js?v=<%= SHOWOFF_VERSION %>"></script>
-  <script type="text/javascript">
-    editUrl  = "<%= @edit %>";
-    issueUrl = "<%= @issues %>";
-    autoTour = false;
-    // increment this each time we add features with new tour stops.
-    tourVersion = 1;
-    $(function() {
-      tours['showoff:activity'] = [
-        {
-          element: ".currentSlide .count",
-          intro: I18n.t('tour.activity.count')
-        }
-      ];
-      tours['showoff:form'] = [
-        {
-          element: "#notes",
-          intro: I18n.t('tour.form.responses'),
-          scrollToElement: false
-        },
-        {
-          element: ".currentSlide input.display",
-          intro: I18n.t('tour.form.display')
-        }
-      ];
-      tours['showoff:presenter'] = [
-        {
-          intro: I18n.t('tour.welcome'),
-          version: 1
-        },
-        {
-          element: "#slaveWindow",
-          intro: I18n.t('tour.displayview'),
-          version: 1
-        },
-        {
-          element: "#annotationLabel",
-          intro: I18n.t('tour.annotations'),
-          version: 1
-        },
-        {
-          element: "#timerSection",
-          intro: I18n.t('tour.timer'),
-          version: 1
-        },
-        {
-          element: "#feedbackPace",
-          intro: I18n.t('tour.pace'),
-          version: 1
-        },
-        {
-          element: "#questions",
-          intro: I18n.t('tour.questions'),
-          version: 1
-        },
-        {
-          element: "#notes-controls",
-          intro: I18n.t('tour.notes'),
-          highlightClass: "tourDark",
-          version: 1
-        },
-        {
-          element: "#slideSource",
-          intro: I18n.t('tour.slidesource'),
-          version: 1
-        },
-        {
-          element: "#settings",
-          intro: I18n.t('tour.settings'),
-          version: 1
-        },
-        {
-          element: "#edit",
-          intro: I18n.t('tour.edit'),
-          version: 1
-        },
-        {
-          element: "#report",
-          intro: I18n.t('tour.report'),
-          version: 1
-        }
-      ].filter(function(item) {
-        // filter out tips for features that have been turned off
-        return ((item['element'] == undefined) || document.querySelector(item['element']));
-      });
-      // Only autoshow when served from localhost, since we don't know if we have a consistent domain for our cookie otherwise.
-      if ( location.hostname == 'localhost' || location.hostname == '127.0.0.1' ) {
-        // enables the flag that shows feature tours
-        autoTour = true;
-        var clientTour = document.cookieHash['tourVersion'] || 0;
-        if(clientTour < tourVersion) {
-          // now make a temporary duplicate of only recent items
-          tours['showoff:presenter:auto'] = tours['showoff:presenter'].filter(function(item) {
-            return (item['version'] > clientTour);
-          });
-          // we don't need to let this record, because we've already tested clientTour
-          showTour('showoff:presenter:auto', false);
-        }
-      }
-    });
-  </script>
 </head>
 <body class="presenter">
@@ -311,5 +200,117 @@
   <%= @slides %>
   </div>
 </div><!-- end pagewrapper -->
+  <script defer type="text/javascript">
+    editUrl  = "<%= @edit %>";
+    issueUrl = "<%= @issues %>";
+    autoTour = false;
+    // increment this each time we add features with new tour stops.
+    tourVersion = 1;
+    $(function() {
+      tours['showoff:activity'] = [
+        {
+          element: ".currentSlide .count",
+          intro: I18n.t('tour.activity.count')
+        }
+      ];
+      tours['showoff:form'] = [
+        {
+          element: "#notes",
+          intro: I18n.t('tour.form.responses'),
+          scrollToElement: false
+        },
+        {
+          element: ".currentSlide input.display",
+          intro: I18n.t('tour.form.display')
+        }
+      ];
+      tours['showoff:presenter'] = [
+        {
+          intro: I18n.t('tour.welcome'),
+          version: 1
+        },
+        {
+          element: "#slaveWindow",
+          intro: I18n.t('tour.displayview'),
+          version: 1
+        },
+        {
+          element: "#annotationLabel",
+          intro: I18n.t('tour.annotations'),
+          version: 1
+        },
+        {
+          element: "#timerSection",
+          intro: I18n.t('tour.timer'),
+          version: 1
+        },
+        {
+          element: "#feedbackPace",
+          intro: I18n.t('tour.pace'),
+          version: 1
+        },
+        {
+          element: "#questions",
+          intro: I18n.t('tour.questions'),
+          version: 1
+        },
+        {
+          element: "#notes-controls",
+          intro: I18n.t('tour.notes'),
+          highlightClass: "tourDark",
+          version: 1
+        },
+        {
+          element: "#slideSource",
+          intro: I18n.t('tour.slidesource'),
+          version: 1
+        },
+        {
+          element: "#settings",
+          intro: I18n.t('tour.settings'),
+          version: 1
+        },
+        {
+          element: "#edit",
+          intro: I18n.t('tour.edit'),
+          version: 1
+        },
+        {
+          element: "#report",
+          intro: I18n.t('tour.report'),
+          version: 1
+        }
+      ].filter(function(item) {
+        // filter out tips for features that have been turned off
+        return ((item['element'] == undefined) || document.querySelector(item['element']));
+      });
+      // Only autoshow when served from localhost, since we don't know if we have a consistent domain for our cookie otherwise.
+      if ( location.hostname == 'localhost' || location.hostname == '127.0.0.1' ) {
+        // enables the flag that shows feature tours
+        autoTour = true;
+        var clientTour = document.cookieHash['tourVersion'] || 0;
+        if(clientTour < tourVersion) {
+          // now make a temporary duplicate of only recent items
+          tours['showoff:presenter:auto'] = tours['showoff:presenter'].filter(function(item) {
+            return (item['version'] > clientTour);
+          });
+          // we don't need to let this record, because we've already tested clientTour
+          showTour('showoff:presenter:auto', false);
+        }
+      }
+    });
+  </script>
 </body>
 </html>

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.19.6
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -211,16 +211,16 @@ dependencies:
   name: commonmarker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mg
   requirement: !ruby/object:Gem::Requirement