showoff 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 287b3884acfc8db9d00a923f3f1adfe7b11ba8c9
-  data.tar.gz: a7e666855d18e929b560101d26dc331d811fe330
+  metadata.gz: e2c16f1de4dfa9e1401b2d8882200287df206d61
+  data.tar.gz: e4db72901b96e5faf1c35ad018e60d3c29a14865
 SHA512:
-  metadata.gz: 8b2ca3ab1e8ae0d47c7b6ecf0e8571c988255158e4ff079df9e2258f0a1ba01013edff1ce079b85908b504443469eeaabaa1f1dd9f2b75bc97b28838d35a1f95
-  data.tar.gz: 3c093017f4806204b96f3758ed0953409d1443349c056b0491a8404227e81d07807ab3dd9307e1b1c8985a5072dd74f5b9cc2d0b2b3246b2c06b78a787b43794
+  metadata.gz: 95c4ef9e3f7d94060af10f68bf7a7b0188c99b034eefc431e75e26cf4943d7697ccbf1d6f8c3cc884af6f97f03534af19b04c05e2cc00f615d6e1c12826667ed
+  data.tar.gz: c9c46ab3f68540dd773d7140c05d3e3cb8c23646e0a945ed7b0b5c455418e9dd9a10837f4bf0e33ae0bbe6bac72e8056944eaf03e29f43dc0f94a857d37a6f22

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.13.3'
+SHOWOFF_VERSION = '0.13.4'

data/lib/showoff.rb

@@ -997,6 +997,9 @@ class ShowOff < Sinatra::Application
     end
 
     def slides(static=false)
+      # If we're displaying from a repository, let's update it
+      ShowOffUtils.update(settings.verbose) if settings.url
+
       # if we have a cache and we're not asking to invalidate it
       return @@cache if (@@cache and params['cache'] != 'clear')
       content = get_slides_html(:static=>static)

data/lib/showoff_utils.rb

@@ -215,9 +215,15 @@ class ShowOffUtils
         yield if block_given?
       end
     end
+  end
 
+  # just update the repo in cwd
+  def self.update(verbose=false)
+    puts "Updating presentation repository..." if verbose
+    system('git', 'pull')
   end
 
+
   # Makes a slide as a string.
   # [title] title of the slide
   # [classes] any "classes" to include, such as 'smaller', 'transition', etc.

data/public/css/presenter.css

@@ -202,7 +202,8 @@
 
     .submenu {
       display: block;
-      overflow: auto;
+      overflow-x: hidden;
+      overflow-y: auto;
     }
 
   #presenter {

data/public/js/presenter.js

@@ -632,12 +632,12 @@ function stopTimer() {
  ********************/
 function toggleFollower()
 {
-  mode.follow = $("#remoteToggle").attr("checked");
+  mode.follow = $("#remoteToggle").prop("checked");
   getPosition();
 }
 
 function toggleUpdater()
 {
-  mode.update = $("#followerToggle").attr("checked");
+  mode.update = $("#followerToggle").prop("checked");
   update();
 }

data/public/js/showoff.js

@@ -82,18 +82,21 @@ function loadSlides(load_slides, prefix, reload) {
   if (reload) {
     url += "?cache=clear";
   }
-	//load slides offscreen, wait for images and then initialize
-	if (load_slides) {
-		$("#slides").load(url, false, function(){
-			$("#slides img").batchImageLoad({
-			loadingCompleteCallback: initializePresentation(prefix)
-		})
-		})
-	} else {
-	$("#slides img").batchImageLoad({
-		loadingCompleteCallback: initializePresentation(prefix)
-	})
-	}
+  //load slides offscreen, wait for images and then initialize
+  if (load_slides) {
+    $("#slides").load(url, false, function(){
+      $("#slides img").batchImageLoad({
+        loadingCompleteCallback: initializePresentation(prefix)
+      });
+      if (reload) {
+        location.reload(true);
+      }
+    })
+  } else {
+    $("#slides img").batchImageLoad({
+      loadingCompleteCallback: initializePresentation(prefix)
+    })
+  }
 }
 
 function initializePresentation(prefix) {
@@ -1148,7 +1151,7 @@ function toggleDebug () {
 
 function reloadSlides () {
   if (confirm('Are you sure you want to reload the slides?')) {
-    location.reload(true);
+    $('html,body').css('cursor','progress');
     loadSlides(loadSlidesBool, loadSlidesPrefix, true);
     showSlide();
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra