showoff 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 210a91a071a71b8ec4de4b9c128917eb19eb1f2c
-  data.tar.gz: f0cc7f2e1efc78af6bc92dfea9726d45db035425
+  metadata.gz: b65ae2cdb55992dc61f317faf924fd93cdefd594
+  data.tar.gz: f4331abee28540e37e8362c52ffe87c705405f07
 SHA512:
-  metadata.gz: e62e8471ed1070766e8cf84d5387403d7a97ab245dabd5125595b5d986d73ab0b79ceb20ff0abfba06919b4ba9cfa45e45fcdea3b651a6a0fb4937ba17e6d239
-  data.tar.gz: 7c11b48e407c3fe975924e14a00a18ada6d74781029186f84e87d731ac5d0cd119272ff78a6ea0094c83e5fbb924bb017584ddb5271b76fce72caa2ee91050e5
+  metadata.gz: f74cea3ee9a73a8b9240bcd7d11d909766ce6ecb38ec8fc57cea3ff1a57f803b5475b2afa0121685230154ae51c64751cb3d80972eddd71fd2d901ba58640efc
+  data.tar.gz: 938c693644cd33d34b9945131cc6c607d32fa6f162f03f4ce4a166e9eb37532fcf0d6074b9da0e254124ed5ee1a9351d3697312fd667118077eab74a652ad0be

data/lib/showoff.rb

@@ -521,6 +521,8 @@ class ShowOff < Sinatra::Application
 
       # Process links
       doc.css('a').each do |link|
+        next unless link.include? 'href'
+        next unless link.include? 'class'
         next if link['href'].start_with? '#'
         next if link['class'].split.include? 'processed' rescue nil
 
@@ -1016,7 +1018,7 @@ class ShowOff < Sinatra::Application
               data << process_markdown(path, section, File.read(filename), opts)
             rescue Errno::ENOENT => e
               @logger.error e.message
-              data << process_markdown(path, section, "!SLIDE\n# Missing File!\n## #{fname}", opts)
+              data << process_markdown(path, section, "!SLIDE\n# Missing File!\n## #{filename}", opts)
             end
           end
 
@@ -1766,6 +1768,8 @@ class ShowOff < Sinatra::Application
       end
     rescue NoMethodError => e
       @logger.warn "Invalid object #{what} requested."
+      @logger.warn e.message
+      @logger.debug e.backtrace.join("\n")
       raise Sinatra::NotFound
     end
   end

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.17.0'
+SHOWOFF_VERSION = '0.17.1'

data/lib/showoff_utils.rb

@@ -441,17 +441,12 @@ class ShowOffUtils
     # each entry in sections can be:
     # - "filename.md"
     # - { "section": "filename.md" }
+    # - { "section": "directory" }
     # - { "section": [ "array.md, "of.md, "files.md"] }
     # - { "include": "sections.json" }
     sections = {}
     data.map do |entry|
-      if entry.is_a? String
-        if File.directory? entry
-          next Dir.glob("#{entry}/**/*.md").sort
-        else
-          next entry
-        end
-      end
+      next entry if entry.is_a? String
       next nil unless entry.is_a? Hash
       next entry['section'] if entry.include? 'section'
 
@@ -476,9 +471,15 @@ class ShowOffUtils
       # We do this in two passes simply because most of it was already done
       # and I don't want to waste time on legacy functionality.
       path = File.dirname(filename)
-
       sections[path] ||= []
-      sections[path]  << filename
+
+      if File.directory? filename
+        Dir.glob("#{filename}/**/*.md").sort.each do |slidefile|
+          sections[path]  << slidefile
+        end
+      else
+        sections[path]  << filename
+      end
     end
     sections
   end

data/public/css/presenter.css

@@ -617,21 +617,22 @@ a.controls {
 }
 
 /* hide some elements when the screen is too small */
-@media screen and (max-width: 900px)
-{
-  #topbar .fa {
+@media screen and (max-width: 1024px) {
+  #links .fa {
     display: none;
   }
-  .desktop a {
-    margin-right: 0.25em;
-  }
 }
 
+@media screen and (max-width: 880px) {
+  #topbar #printSlides,
+  #topbar #statslink {
+    display: none;
+  }
+}
 
 /* iPhone */
 /* Portrait */
-@media screen and (max-width: 480px)
-{
+@media screen and (max-width: 640px) {
   .no-mobile {
     display: none;
   }
@@ -686,15 +687,9 @@ a.controls {
     display: inline;
   }
 
-  #topbar {
-    background-image: url(menu.png);
-    background-position: left center;
-    background-repeat: no-repeat;
-  }
   #sidebar {
     display: block;
     position: absolute;
-    top: 25px;
     z-index: 99999;
     height: 100%;
     overflow: scroll;

data/public/css/showoff.css

@@ -135,6 +135,11 @@ pre code {
   }
 }
 
+.ui-button:active {
+  border-color: #263238;
+  background-color: #263238;
+}
+
 /* plain (non-bullet) text */
 .content > p,
 .content > form > p {
@@ -284,64 +289,6 @@ img#disconnected {
   display: none;
 }
 
-#help {
-  display: none;
-  position:absolute;
-  overflow: auto;
-  top: 5%;
-  left: 25%;
-  width: 50%;
-  max-height: 90%;
-  z-index: 2147483647;
-  padding: 0 16px 16px 16px;
-  border-radius: 4px;
-  -webkit-box-shadow:0 0 25px rgba(0,0,0,0.35);
-  -moz-box-shadow:0 0 25px rgba(0,0,0,0.35);
-  box-shadow:0 0 25px rgba(0,0,0,0.35);
-  background-color: #fff;
-  font-size: 0.75em;
-}
-
-  #help div {
-    padding: 6px 0;
-  }
-
-    #help h1 {
-      border-bottom: 2px solid #ccc;
-    }
-
-    #help div + div {
-      border-top: 1px solid #eee;
-    }
-
-    #help .description,
-    #help .action,
-    #help .hotkeys {
-      display: inline-block;
-      vertical-align: middle;
-    }
-
-    #help .description {
-      width: 30%;
-    }
-
-    #help .action {
-      width: 15%;
-      color: gray;
-    }
-
-    #help .hotkeys {
-      width: 25%;
-    }
-
-    #help .hotkeys .key {
-      border: 1px solid #ccc;
-      background-color: #dfdfdf;
-      border-radius: 0.25em;
-      padding: 0.15em 0.5em;
-      margin: 0.25em;
-    }
-
 /**********************************
  ***       Table styling        ***
  **********************************/
@@ -800,13 +747,21 @@ form .element {
 /*****************
  ***   modals   ***
  *****************/
+#help-modal {
+  font-size: .9em;
+}
+
+#help-modal .ui-dialog .ui-dialog-title {
+  font-size: 1em;
+}
+
 .ui-dialog.ui-widget-content {
   border: none;
   box-shadow:0 0 25px rgba(0,0,0,0.35);
 }
 
 .ui-dialog .links,
-.ui-dialog .description,
+#settings-modal .description,
 .ui-dialog select {
   font-size: .75em;
 }
@@ -835,6 +790,10 @@ form .element {
   padding-left: 1em;
 }
 
+.ui-dialog .ui-button {
+  font-size: .8em;
+}
+
 .ui-dialog .links {
   text-align: right;
 }
@@ -853,6 +812,42 @@ form .element {
   display: none;
 }
 
+#help div {
+  padding: 6px 0;
+}
+
+  #help div + div {
+    border-top: 1px solid #eee;
+  }
+
+  #help .description,
+  #help .action,
+  #help .hotkeys {
+    display: inline-block;
+    vertical-align: middle;
+  }
+
+  #help .description {
+    width: 30%;
+  }
+
+  #help .action {
+    width: 15%;
+    color: gray;
+  }
+
+  #help .hotkeys {
+    width: 25%;
+  }
+
+  #help .hotkeys .key {
+    border: 1px solid #ccc;
+    background-color: #dfdfdf;
+    border-radius: 0.25em;
+    padding: 0.15em 0.5em;
+    margin: 0.25em;
+  }
+
  /*****************
   *** end modal ***
   *****************/

data/public/js/presenter.js

@@ -79,10 +79,6 @@ $(document).ready(function(){
       bind('swipeleft', presNextStep).  // next
       bind('swiperight', presPrevStep); // prev
 
-    $('#topbar #slideSource').click( function(e) {
-      $('#sidebar').toggle();
-    });
-
     $('#topbar #update').click( function(e) {
       e.preventDefault();
       $.get("/getpage", function(data) {

data/public/js/showoff.js

@@ -91,6 +91,21 @@ function setupPreso(load_slides, prefix) {
   // yes, this is a global
   annotations = new Annotate();
 
+  $("#help-modal").dialog({
+    autoOpen: false,
+    dialogClass: "no-close",
+    draggable: false,
+    height: 640,
+    modal: true,
+    resizable: false,
+    width: 640,
+    buttons: {
+      Close: function() {
+        $( this ).dialog( "close" );
+      }
+    }
+  });
+
   // wait until the presentation is loaded to hook up the previews.
   $("body").bind("showoff:loaded", function (event) {
     $('#navigation li a.navItem').hover(function() {
@@ -225,7 +240,15 @@ function zoom(presenter) {
   }
 
   // Calculate margins to center the thing *before* scaling
-  var hMargin = (hBody - hSlide) /2;
+  // On mobile, we'll top align, everywhere else vertical center it.
+  if(mobile()) {
+    // (center of slide to top) - (half of the zoomed slide)
+    //var hMargin = (hSlide/2 * newZoom) - (hSlide / 2);
+    var hMargin = (hSlide * newZoom - hSlide) / 2;
+  }
+  else {
+    var hMargin = (hBody - hSlide) /2;
+  }
   var wMargin = (wBody - wSlide) /2;
 
   preso.css("margin", hMargin + "px " + wMargin + "px");
@@ -1361,7 +1384,8 @@ function toggleFooter() {
 }
 
 function toggleHelp () {
-  $('#help').toggle();
+  var help = $("#help-modal");
+  help.dialog("isOpen") ? help.dialog("close") : help.dialog("open");
 }
 
 function toggleContents () {
@@ -1685,7 +1709,7 @@ function setupStats(data)
 
 /* Is this a mobile device? */
 function mobile() {
-  return ( $(window).width() <= 480 )
+  return ( $(window).width() <= 640 )
 }
 
 /* check browser support for one or more css properties */

data/views/header.erb

@@ -25,6 +25,7 @@
   <script type="text/javascript" src="<%= @asset_path %>/js/zoomline-0.0.1.js"></script>
   <script type="text/javascript" src="<%= @asset_path %>/js/highlight.pack-9.2.0.js"></script>
   <script type="text/javascript" src="<%= @asset_path %>/js/mermaid-6.0.0-min.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/jquery-ui-1.12.1.js"></script>
 
   <script type="text/javascript" src="<%= @asset_path %>/js/coffee-script-1.1.3-pre.js"></script>
 

data/views/help.erb

@@ -1,84 +1,85 @@
-<div id="help">
-  <h1>Showoff Hotkeys</h1>
-  <div>
-    <span class="description">Move to the next slide.</span>
-    <span class="action">NEXT</span>
-    <span class="hotkeys"><%= mapped_keys('NEXT') %></span>
-  </div>
-  <div>
-    <span class="description">Move to the previous slide.</span>
-    <span class="action">PREV</span>
-    <span class="hotkeys"><%= mapped_keys('PREV') %></span>
-  </div>
-  <div>
-    <span class="description">Show the table of contents menu.</span>
-    <span class="action">CONTENTS</span>
-    <span class="hotkeys"><%= mapped_keys('CONTENTS') %></span>
-  </div>
-  <div>
-    <span class="description">Toggle follow mode.</span>
-    <span class="action">FOLLOW</span>
-    <span class="hotkeys"><%= mapped_keys('FOLLOW') %></span>
-  </div>
-  <div>
-    <span class="description">Show this help dialog.</span>
-    <span class="action">HELP</span>
-    <span class="hotkeys"><%= mapped_keys('HELP') %></span>
-  </div>
+<div id="help-modal" title="Help">
+  <div id="help">
+    <div>
+      <span class="description">Move to the next slide.</span>
+      <span class="action">NEXT</span>
+      <span class="hotkeys"><%= mapped_keys('NEXT') %></span>
+    </div>
+    <div>
+      <span class="description">Move to the previous slide.</span>
+      <span class="action">PREV</span>
+      <span class="hotkeys"><%= mapped_keys('PREV') %></span>
+    </div>
+    <div>
+      <span class="description">Show the table of contents menu.</span>
+      <span class="action">CONTENTS</span>
+      <span class="hotkeys"><%= mapped_keys('CONTENTS') %></span>
+    </div>
+    <div>
+      <span class="description">Toggle follow mode.</span>
+      <span class="action">FOLLOW</span>
+      <span class="hotkeys"><%= mapped_keys('FOLLOW') %></span>
+    </div>
+    <div>
+      <span class="description">Show this help dialog.</span>
+      <span class="action">HELP</span>
+      <span class="hotkeys"><%= mapped_keys('HELP') %></span>
+    </div>
 
-  <hr />
+    <hr />
 
-  <div>
-    <span class="description">Refresh slide content.</span>
-    <span class="action">REFRESH</span>
-    <span class="hotkeys"><%= mapped_keys('REFRESH') %></span>
-  </div>
-  <div>
-    <span class="description">Completely reload Showoff.</span>
-    <span class="action">RELOAD</span>
-    <span class="hotkeys"><%= mapped_keys('RELOAD') %></span>
-  </div>
-  <div>
-    <span class="description">Blank the screen.</span>
-    <span class="action">BLANK</span>
-    <span class="hotkeys"><%= mapped_keys('BLANK') %></span>
-  </div>
-  <div>
-    <span class="description">Toggle the display footer.</span>
-    <span class="action">FOOTER</span>
-    <span class="hotkeys"><%= mapped_keys('FOOTER') %></span>
-  </div>
-  <div>
-    <span class="description">Toggle notes display.</span>
-    <span class="action">NOTES</span>
-    <span class="hotkeys"><%= mapped_keys('NOTES') %></span>
-  </div>
-  <div>
-    <span class="description">Clear code execution results.</span>
-    <span class="action">CLEAR</span>
-    <span class="hotkeys"><%= mapped_keys('CLEAR') %></span>
-  </div>
-  <div>
-    <span class="description">Pause the presentation.</span>
-    <span class="action">PAUSE</span>
-    <span class="hotkeys"><%= mapped_keys('PAUSE') %></span>
-  </div>
-  <div>
-    <span class="description">Display slideshow of <tt>preshow</tt> images on a timer.</span>
-    <span class="action">PRESHOW</span>
-    <span class="hotkeys"><%= mapped_keys('PRESHOW') %></span>
-  </div>
-  <div>
-    <span class="description">Execute the first visible code block.</span>
-    <span class="action">EXECUTE</span>
-    <span class="hotkeys"><%= mapped_keys('EXECUTE') %></span>
-  </div>
+    <div>
+      <span class="description">Refresh slide content.</span>
+      <span class="action">REFRESH</span>
+      <span class="hotkeys"><%= mapped_keys('REFRESH') %></span>
+    </div>
+    <div>
+      <span class="description">Completely reload Showoff.</span>
+      <span class="action">RELOAD</span>
+      <span class="hotkeys"><%= mapped_keys('RELOAD') %></span>
+    </div>
+    <div>
+      <span class="description">Blank the screen.</span>
+      <span class="action">BLANK</span>
+      <span class="hotkeys"><%= mapped_keys('BLANK') %></span>
+    </div>
+    <div>
+      <span class="description">Toggle the display footer.</span>
+      <span class="action">FOOTER</span>
+      <span class="hotkeys"><%= mapped_keys('FOOTER') %></span>
+    </div>
+    <div>
+      <span class="description">Toggle notes display.</span>
+      <span class="action">NOTES</span>
+      <span class="hotkeys"><%= mapped_keys('NOTES') %></span>
+    </div>
+    <div>
+      <span class="description">Clear code execution results.</span>
+      <span class="action">CLEAR</span>
+      <span class="hotkeys"><%= mapped_keys('CLEAR') %></span>
+    </div>
+    <div>
+      <span class="description">Pause the presentation.</span>
+      <span class="action">PAUSE</span>
+      <span class="hotkeys"><%= mapped_keys('PAUSE') %></span>
+    </div>
+    <div>
+      <span class="description">Display slideshow of <tt>preshow</tt> images on a timer.</span>
+      <span class="action">PRESHOW</span>
+      <span class="hotkeys"><%= mapped_keys('PRESHOW') %></span>
+    </div>
+    <div>
+      <span class="description">Execute the first visible code block.</span>
+      <span class="action">EXECUTE</span>
+      <span class="hotkeys"><%= mapped_keys('EXECUTE') %></span>
+    </div>
 
-  <hr />
+    <hr />
 
-  <div>
-    <span class="description">Show debugging information.</span>
-    <span class="action">DEBUG</span>
-    <span class="hotkeys"><%= mapped_keys('DEBUG') %></span>
+    <div>
+      <span class="description">Show debugging information.</span>
+      <span class="action">DEBUG</span>
+      <span class="hotkeys"><%= mapped_keys('DEBUG') %></span>
+    </div>
   </div>
 </div>

data/views/presenter.erb

@@ -8,7 +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" src="<%= @asset_path %>/js/jquery-ui-1.12.1.js"></script>
 
   <script type="text/javascript">
     editUrl  = "<%= @edit %>";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -329,7 +329,6 @@ files:
 - public/css/highlight/xcode.css
 - public/css/highlight/zenburn.css
 - public/css/jquery-ui-1.12.1.css
-- public/css/menu.png
 - public/css/mermaid-6.0.0.css
 - public/css/onepage.css
 - public/css/pace.png