showoff 0.9.10.7 → 0.9.10.8

data/public/js/presenter.js

@@ -118,12 +118,20 @@ function reportIssue() {
   window.open(link);
 }
 
+// open browser to remote edit URL
 function editSlide() {
   var slide = $("span#slideFile").text().replace(/\/\d+$/, '');
   var link  = editUrl + slide + ".md";
   window.open(link);
 }
 
+// call the edit endpoint to open up a local file editor
+function openEditor() {
+  var slide = $("span#slideFile").text().replace(/\/\d+$/, '');
+  var link  = '/edit/' + slide + ".md";
+  $.get(link);
+}
+
 function toggleSlave() {
   mode.slave = !mode.slave;
   openSlave();
@@ -186,7 +194,7 @@ function openNext()
   if (mode.next) {
     try {
       if(nextWindow == null || typeof(nextWindow) == 'undefined' || nextWindow.closed){
-          nextWindow = window.open('/?track=false&feedback=false&next=true#' + nextSlideNum(true),'','width=300,height=200');
+          nextWindow = window.open('/?track=false&feedback=false&next=true#' + nextSlideNum(true),'','width=320,height=300');
       }
       else if(nextWindow.location.hash != '#' + nextSlideNum(true)) {
         // maybe we need to reset content?

data/public/js/showoff.js

@@ -15,6 +15,7 @@ var incrCurr = 0
 var incrCode = false
 var debugMode = false
 var gotoSlidenum = 0
+var lastMessageGuid = 0
 var shiftKeyActive = false
 var query
 var slideStartTime = new Date().getTime()
@@ -62,7 +63,11 @@ function setupPreso(load_slides, prefix) {
   if(query.track == 'false') mode.track = false;
 
   // make sure that the next view doesn't bugger things on the first load
-  if(query.next == 'true')   mode.next = true;
+  if(query.next == 'true') {
+    $('#preso').addClass('zoomed');
+    mode.next = true;
+    zoom();
+  }
 
   // Make sure the slides always look right.
   // Better would be dynamic calculations, but this is enough for now.
@@ -190,6 +195,28 @@ function initializePresentation(prefix) {
 	$("#preso").trigger("showoff:loaded");
 }
 
+/* This looks like the zoom() function for the presenter preview, but it uses a different algorithm */
+function zoom()
+{
+  if(window.innerWidth <= 480) {
+    $(".zoomed").css("zoom", 0.32);
+  }
+  else {
+    var hSlide = parseFloat($("#preso").height());
+    var wSlide = parseFloat($("#preso").width());
+    var hBody  = parseFloat($("html").height());
+    var wBody  = parseFloat($("html").width());
+
+    newZoom = Math.min(hBody/hSlide, wBody/wSlide) - 0.04;
+
+    $(".zoomed").css("zoom", newZoom);
+    $(".zoomed").css("-ms-zoom", newZoom);
+    $(".zoomed").css("-webkit-zoom", newZoom);
+    $(".zoomed").css("-moz-transform", "scale("+newZoom+")");
+    $(".zoomed").css("-moz-transform-origin", "left top");
+  }
+}
+
 function centerSlides(slides) {
 	slides.each(function(s, slide) {
 		centerSlide(slide)
@@ -271,8 +298,9 @@ function setupSlideParamsCheck() {
 }
 
 function gotoSlide(slideNum, updatepv) {
-  slidenum = parseInt(slideNum);
-  if (!isNaN(slidenum)) {
+  var newslide = parseInt(slideNum);
+  if (slidenum != newslide && !isNaN(newslide)) {
+    slidenum = newslide;
     showSlide(false, updatepv);
   }
 }
@@ -338,6 +366,10 @@ function showSlide(back_step, updatepv) {
 	var fileName = currentSlide.children().first().attr('ref');
   $('#slideFilename').text(fileName);
 
+  if (query.next) {
+    $(currentSlide).find('li').removeClass('hidden');
+  }
+
   // Update presenter view, if we spawned one
 	if (updatepv && 'presenterView' in window && ! mode.next) {
     var pv = window.presenterView;
@@ -410,17 +442,17 @@ function determineIncremental()
 		incrCode = true
 	}
 	incrElem.each(function(s, elem) {
-		$(elem).css('visibility', 'hidden');
+		$(elem).addClass('incremental hidden');
 	})
 }
 
 function showIncremental(incr)
 {
-		elem = incrElem.eq(incrCurr)
+		elem = incrElem.eq(incrCurr);
 		if (incrCode && elem.hasClass('command')) {
-			incrElem.eq(incrCurr).css('visibility', 'visible').jTypeWriter({duration:1.0})
+			incrElem.eq(incrCurr).removeClass('hidden').jTypeWriter({duration:1.0});
 		} else {
-			incrElem.eq(incrCurr).css('visibility', 'visible')
+			incrElem.eq(incrCurr).removeClass('hidden');
 		}
 }
 
@@ -636,6 +668,16 @@ function disconnected() {
 function parseMessage(data) {
   var command = JSON.parse(data);
 
+  if ("id" in command) {
+    var guid = command['id'];
+    if (lastMessageGuid != guid) {
+      lastMessageGuid = guid;
+    }
+    else {
+      return;
+    }
+  }
+
   if ("current" in command) { follow(command["current"]); }
 
   // Presenter messages only, so catch errors if method doesn't exist
@@ -646,7 +688,6 @@ function parseMessage(data) {
   catch(e) {
     console.log("Not a presenter!");
   }
-
 }
 
 function sendPace(pace) {

data/views/presenter.erb

@@ -31,7 +31,12 @@
 <div id="main">
   <div id="topbar">
     <div id="slideSource">
-      Source: <span id="slideFile"></span>
+      Source:
+      <% if @request.host == 'localhost' %>
+        <a href="javascript:openEditor();"><span id="slideFile"></span></a>
+      <% else %>
+        <span id="slideFile">
+      <% end %>
     </div>
     <span id="links">
       <span class="desktop">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.9.10.7
+  version: 0.9.10.8
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -232,6 +232,7 @@ files:
 - public/js/core.js
 - public/js/fg.menu.js
 - public/js/jTypeWriter.js
+- public/js/jquery-1.11.2.js
 - public/js/jquery-1.4.2.min.js
 - public/js/jquery-print.js
 - public/js/jquery.batchImageLoad.js