showoff 0.14.3 → 0.15.0

data/public/js/showoff.js

@@ -68,11 +68,6 @@ function setupPreso(load_slides, prefix) {
   // give us the ability to disable tracking via url parameter
   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;
-  }
-
   // Make sure the slides always look right.
   // Better would be dynamic calculations, but this is enough for now.
   zoom();
@@ -87,20 +82,24 @@ function setupPreso(load_slides, prefix) {
   }
 }
 
-function loadSlides(load_slides, prefix, reload) {
+function loadSlides(load_slides, prefix, reload, hard) {
   var url = loadSlidesPrefix + "slides";
   if (reload) {
     url += "?cache=clear";
   }
+
   //load slides offscreen, wait for images and then initialize
+  $('body').addClass('busy');
   if (load_slides) {
     $("#slides").load(url, false, function(){
-      $("#slides img").batchImageLoad({
-        loadingCompleteCallback: initializePresentation(prefix)
-      });
-      if (reload) {
+      if(hard) {
         location.reload(true);
       }
+      else {
+        $("#slides img").batchImageLoad({
+          loadingCompleteCallback: initializePresentation(prefix)
+        });
+      }
     })
   } else {
     $("#slides img").batchImageLoad({
@@ -126,7 +125,7 @@ function initializePresentation(prefix) {
 		timeout: 0
 	})
 
-	setupMenu()
+	setupMenu();
 
 	if (slidesLoaded) {
 		showSlide()
@@ -136,6 +135,8 @@ function initializePresentation(prefix) {
 	}
 	setupSlideParamsCheck();
 
+  // Remove spinner in case we're reloading
+  $('body').removeClass('busy');
 
   $('pre.highlight code').each(function(i, block) {
     try {
@@ -187,20 +188,18 @@ function zoom(presenter) {
 
   var newZoom = Math.min(hBody/hSlide, wBody/wSlide);
 
-  // Because Firefox's transform doesn't scale up very well
-  newZoom = newZoom > 1 ? 1 : newZoom - .04;
+  // match the 65/35 split in the stylesheet for the side-by-side layout
+  if($("#preview").hasClass("beside")) {
+    wBody  *= 0.64;
+    newZoom = Math.min(hBody/hSlide, wBody/wSlide);
+  }
 
-  // Calculate the new offsets to roughly center the preview again
-  var hPos = (hBody - (hSlide * newZoom)) / 2;
-  var wPos = (wBody - (wSlide * newZoom)) / 2;
+  // Calculate margins to center the thing *before* scaling
+  var hMargin = (hBody - hSlide) /2;
+  var wMargin = (wBody - wSlide) /2;
 
-  preso.css("zoom", newZoom);
-  preso.css("-ms-zoom", newZoom);
-  preso.css("-webkit-zoom", newZoom);
-  // Firefox doesn't support zoom
-  // Don't use standard transform to avoid modifying Chrome
-  preso.css("-moz-transform", "scale(" + newZoom + ") translateX(" + wPos + "px) translateY(" + hPos + "px)");
-  preso.css("-moz-transform-origin", "0 0");
+  preso.css("margin", hMargin + "px " + wMargin + "px");
+  preso.css("transform", "scale(" + newZoom + ")");
 
   // correct the zoom factor for the presenter
   if (presenter) {
@@ -212,7 +211,6 @@ function zoom(presenter) {
 
     // TODO: When we fix the presenter on IE so the viewport isn't all wack, we
     // may have to revisit this.
-
     var zoomLevel = Number( preso.css('zoom') ) || 1;
     annotations.zoom = 1 / zoomLevel
   }
@@ -456,8 +454,9 @@ function setupSlideParamsCheck() {
 function gotoSlide(slideNum, updatepv) {
   var newslide = parseInt(slideNum);
   if (slidenum != newslide && !isNaN(newslide)) {
+    var back = (newslide == (slidenum - 1))
     slidenum = newslide;
-    showSlide(false, updatepv);
+    showSlide(back, updatepv);
   }
 }
 
@@ -543,7 +542,7 @@ function showSlide(back_step, updatepv) {
 
 
   // Update presenter view, if we spawned one
-	if (updatepv && 'presenterView' in window && ! mode.next) {
+	if (updatepv && 'presenterView' in window) {
     var pv = window.presenterView;
 		pv.slidenum = slidenum;
     pv.incrCurr = incrCurr
@@ -617,7 +616,7 @@ function determineIncremental()
 {
 	incrCurr = 0
 	incrCode = false
-	incrElem = currentSlide.find(".incremental > ul > li")
+	incrElem = currentSlide.find(".incremental li")
 	incrSteps = incrElem.size()
 	if(incrSteps == 0) {
 		// also look for commandline
@@ -897,7 +896,7 @@ function parseMessage(data) {
   try {
     switch (command['message']) {
       case 'current':
-        follow(command["current"]);
+        follow(command["current"], command["increment"]);
         break;
 
       case 'complete':
@@ -1027,10 +1026,29 @@ function editSlide() {
   window.open(link);
 }
 
-function follow(slide) {
+function follow(slide, newIncrement) {
   if (mode.follow) {
+    var lastSlide = slidenum;
     console.log("New slide: " + slide);
     gotoSlide(slide);
+
+    if( ! $("body").hasClass("presenter") ) {
+      switch (slidenum - lastSlide) {
+        case -1:
+          fireEvent("showoff:prev");
+          break;
+
+        case 1:
+          fireEvent("showoff:next");
+          break;
+      }
+
+      // if the master says we're incrementing. Use a loop in case the viewer is out of sync
+      while(newIncrement > incrCurr) {
+        increment();
+      }
+
+    }
   }
 }
 
@@ -1039,41 +1057,44 @@ function getPosition() {
   ws.send(JSON.stringify({ message: 'position' }));
 }
 
+function fireEvent(ev) {
+  var event = jQuery.Event(ev);
+  $(currentSlide).find(".content").trigger(event);
+  if (event.isDefaultPrevented()) {
+    return;
+  }
+}
+
+function increment() {
+  showIncremental(incrCurr);
+
+  var incrEvent = jQuery.Event("showoff:incr");
+  incrEvent.slidenum = slidenum;
+  incrEvent.incr = incrCurr;
+  $(currentSlide).find(".content").trigger(incrEvent);
+
+  incrCurr++;
+}
+
 function prevStep(updatepv)
 {
-	var event = jQuery.Event("showoff:prev");
-	$(currentSlide).find(".content").trigger(event);
-	if (event.isDefaultPrevented()) {
-			return;
-	}
-
+  fireEvent("showoff:prev");
   track();
-
-	slidenum--
-	return showSlide(true, updatepv) // We show the slide fully loaded
+  slidenum--;
+  return showSlide(true, updatepv); // We show the slide fully loaded
 }
 
 function nextStep(updatepv)
 {
-	var event = jQuery.Event("showoff:next");
-	$(currentSlide).find(".content").trigger(event);
-	if (event.isDefaultPrevented()) {
-			return;
-	}
-
-	track();
+  fireEvent("showoff:next");
+  track();
 
-	if (incrCurr >= incrSteps) {
-		slidenum++
-		return showSlide(false, updatepv)
-	} else {
-		showIncremental(incrCurr);
-		var incrEvent = jQuery.Event("showoff:incr");
-		incrEvent.slidenum = slidenum;
-		incrEvent.incr = incrCurr;
-		$(currentSlide).find(".content").trigger(incrEvent);
-		incrCurr++;
-	}
+  if (incrCurr >= incrSteps) {
+    slidenum++;
+    return showSlide(false, updatepv);
+  } else {
+    increment();
+  }
 }
 
 // carrying on our grand tradition of overwriting functions of the same name with presenter.js
@@ -1172,19 +1193,20 @@ function keyDown(event){
   }
 
   switch(getAction(event)) {
-    case 'DEBUG':     toggleDebug();    break;
-    case 'PREV':      prevStep();       break;
-    case 'NEXT':      nextStep();       break;
-    case 'RELOAD':    reloadSlides();   break;
-    case 'CONTENTS':  toggleContents(); break;
-    case 'HELP':      toggleHelp();     break;
-    case 'BLANK':     blankScreen();    break;
-    case 'FOOTER':    toggleFooter();   break;
-    case 'FOLLOW':    toggleFollow();   break;
-    case 'NOTES':     toggleNotes();    break;
-    case 'CLEAR':     removeResults();  break;
-    case 'PAUSE':     togglePause();    break;
-    case 'PRESHOW':   togglePreShow();  break;
+    case 'DEBUG':     toggleDebug();      break;
+    case 'PREV':      prevStep();         break;
+    case 'NEXT':      nextStep();         break;
+    case 'REFRESH':   reloadSlides();     break;
+    case 'RELOAD':    reloadSlides(true); break;
+    case 'CONTENTS':  toggleContents();   break;
+    case 'HELP':      toggleHelp();       break;
+    case 'BLANK':     blankScreen();      break;
+    case 'FOOTER':    toggleFooter();     break;
+    case 'FOLLOW':    toggleFollow();     break;
+    case 'NOTES':     toggleNotes();      break;
+    case 'CLEAR':     removeResults();    break;
+    case 'PAUSE':     togglePause();      break;
+    case 'PRESHOW':   togglePreShow();    break;
     case 'EXECUTE':
       debug('executeCode');
       executeVisibleCodeBlock();
@@ -1243,11 +1265,17 @@ function toggleDebug () {
   doDebugStuff();
 }
 
-function reloadSlides () {
-  if (confirm('Are you sure you want to reload the slides?')) {
-    $('html,body').css('cursor','progress');
-    loadSlides(loadSlidesBool, loadSlidesPrefix, true);
-    showSlide();
+function reloadSlides (hard) {
+  if(hard) {
+    var message = 'Are you sure you want to reload Showoff?';
+  }
+  else {
+    var message = "Are you sure you want to refresh the slide content?\n\n";
+    message    += '(Use `RELOAD` to fully reload the entire UI)';
+  }
+
+  if (confirm(message)) {
+    loadSlides(loadSlidesBool, loadSlidesPrefix, true, hard);
   }
 }
 

data/views/header.erb

@@ -8,26 +8,25 @@
   <% end %>
 
   <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/highlight/<%= @highlightStyle %>.css"  />
-  <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/showoff.css" />
+  <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/showoff.css?v=<%= SHOWOFF_VERSION %>" />
   <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/font-awesome-4.4.0/css/font-awesome.min.css">
 
   <script type="text/javascript" src="<%= @asset_path %>/js/jquery-2.1.4.min.js"></script>
 
-  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.cycle.all.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.cycle.all-2.8.0.js"></script>
   <script type="text/javascript" src="<%= @asset_path %>/js/jquery-print.js"></script>
-  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.batchImageLoad.js"></script>
-  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.parsequery.min.js"></script>
-  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.doubletap-0.1.js"></script>
-  <script type="text/javascript" src="<%= @asset_path %>/js/jTypeWriter.js"> </script>
-  <script type="text/javascript" src="<%= @asset_path %>/js/highlight.pack.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.batchImageLoad-1.0.0.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.parsequery.min-6a20f83.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.doubletap-4ff02c5.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/jTypeWriter-1.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/coffee-script.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/coffee-script-1.1.3-pre.js"></script>
 
-  <script type="text/javascript" src="<%= @asset_path %>/js/annotations.js"></script>
-  <script type="text/javascript" src="<%= @asset_path %>/js/showoff.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/annotations.js?v=<%= SHOWOFF_VERSION %>"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/showoff.js?v=<%= SHOWOFF_VERSION %>"></script>
 
   <% css_files.each do |css_file| %>
-    <% alternate = ShowOffUtils.default_style?(css_file) ? '' : 'alternate ' %>
     <link rel="stylesheet" href="<%= @asset_path %>/file/<%= css_file %>" type="text/css"/>
   <% end %>
 

data/views/header_mini.erb

@@ -7,15 +7,14 @@
     <link rel="icon" href="<%= @favicon %>"/>
   <% end %>
 
-  <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/showoff.css" />
+  <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/showoff.css?v=<%= SHOWOFF_VERSION %>" />
   <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/font-awesome-4.4.0/css/font-awesome.min.css">
 
   <script type="text/javascript" src="<%= @asset_path %>/js/jquery-2.1.4.min.js"></script>
 
-  <script type="text/javascript" src="<%= @asset_path %>/js/showoff.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/showoff.js?v=<%= SHOWOFF_VERSION %>"></script>
 
   <% css_files.each do |css_file| %>
-    <% alternate = ShowOffUtils.default_style?(css_file) ? '' : 'alternate ' %>
     <link rel="stylesheet" href="<%= @asset_path %>/file/<%= css_file %>" type="text/css"/>
   <% end %>
 

data/views/help.erb

@@ -29,7 +29,12 @@
   <hr />
 
   <div>
-    <span class="description">Reload all slides.</span>
+    <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>

data/views/presenter.erb

@@ -3,17 +3,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <%= erb :header %>
-  <link rel="stylesheet" href="<%= @asset_path %>/css/presenter.css" type="text/css"/>
-  <link href="<%= @asset_path %>/css/TimeCircles.css" rel="stylesheet">
-  <script type="text/javascript" src="<%= @asset_path %>/js/TimeCircles.js"></script>
-  <script type="text/javascript" src="<%= @asset_path %>/js/presenter.js"></script>
+  <link rel="stylesheet" href="<%= @asset_path %>/css/presenter.css?v=<%= SHOWOFF_VERSION %>" type="text/css"/>
+  <link href="<%= @asset_path %>/css/TimeCircles-89ac5ae.css" rel="stylesheet">
+  <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 %>";
   </script>
 </head>
 
-<body>
+<body class="presenter">
 <%= erb :help %>
 
 <div id="main">
@@ -40,7 +40,6 @@
         </span>
         <span>
           <a id="slaveWindow" href="javascript:toggleSlave();" title="Enable the display window.">Display Window <i class="fa fa-clone"></i></a>
-          <a id="nextWindow" href="javascript:toggleNext();" title="Enable the next window view.">Next Window <i class="fa fa-clone"></i></a>
           <a id="notesWindow" href="javascript:toggleNotes();" title="Enable the popout notes window.">Notes Window <i class="fa fa-clone"></i></a>
         </span>
         <span>
@@ -48,11 +47,21 @@
           <a id="onePage" href="/" title="Switch to Display Window.">Switch Views <i class="fa fa-exchange fa-rotate-90"></i></a>
         </span>
       </span>
+      <select id="layoutSelector" autocomplete="off">
+        <option value="default" selected>Default Layout</option>
+        <option value="thumbs"   title="Display thumbnail previews of the next and previous slides.">Thumbnails</option>
+        <option value="floating" title="Open the next slide as a floating window.">Floating</option>
+        <option value="beside"   title="Display the next slide as a large preview in the main presenter view.">Side-by-Side</option>
+      </select>
       <span class="mobile">
         <a id="update" href="">Update</a>
       </span>
     </span>
   </div>
+  <div id="nextWindowConfirmation">
+    <p>Browser security requires confirmation before opening a new window.</p>
+    <p><a href="javascript:chooseLayout('default');">cancel</a><input type="button" onClick="javascript:openNext();" value="Open Window" /></p>
+  </div>
 
   <div id="center">
     <div id="sidebar">
@@ -72,11 +81,14 @@
         <img id="paceMarker" src="<%= @asset_path %>/css/paceMarker.png" />
       </div>
       <div id="navigation" class="submenu"></div>
+      <div id="navigationHover"></div>
     </div>
     <div id="presenter">
       <div id="frame">
         <div id="preview">
           <img id="disconnected" src="<%= @asset_path %>/css/disconnected-large.png" />
+          <div id="prevSlide" class="thumb"><div class="container"></div><h3 class="label">Previous</h3></div>
+          <div id="nextSlide" class="thumb"><div class="container"></div><h3 class="label">Next</h3></div>
           <div id="preso">loading presentation...</div>
         </div>
         <div id="annotationToolbar">
@@ -112,7 +124,6 @@
         <span id="enableAnnotations" title="Enable the annotation system.">
           <label for="annotationsToggle">Annotations</label><input type="checkbox" id="annotationsToggle" autocomplete="off" />
         </span>
-
       </div>
     </div>
   </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -199,7 +199,7 @@ files:
 - views/onepage.erb
 - views/presenter.erb
 - views/stats.erb
-- public/css/TimeCircles.css
+- public/css/TimeCircles-89ac5ae.css
 - public/css/disconnected-large.png
 - public/css/disconnected.png
 - public/css/font-awesome-4.4.0/css/font-awesome.min.css
@@ -326,17 +326,17 @@ files:
 - public/css/titlebar/powershell.png
 - public/css/titlebar/right.png
 - public/favicon.ico
-- public/js/TimeCircles.js
+- public/js/TimeCircles-89ac5ae.js
 - public/js/annotations.js
-- public/js/coffee-script.js
-- public/js/highlight.pack.js
-- public/js/jTypeWriter.js
+- public/js/coffee-script-1.1.3-pre.js
+- public/js/highlight.pack-9.2.0.js
+- public/js/jTypeWriter-1.1.js
 - public/js/jquery-2.1.4.min.js
 - public/js/jquery-print.js
-- public/js/jquery.batchImageLoad.js
-- public/js/jquery.cycle.all.js
-- public/js/jquery.doubletap-0.1.js
-- public/js/jquery.parsequery.min.js
+- public/js/jquery.batchImageLoad-1.0.0.js
+- public/js/jquery.cycle.all-2.8.0.js
+- public/js/jquery.doubletap-4ff02c5.js
+- public/js/jquery.parsequery.min-6a20f83.js
 - public/js/presenter.js
 - public/js/showoff.js
 - public/unsupported.html