showoff 0.14.3 → 0.15.0

data/public/js/annotations.js

@@ -208,7 +208,7 @@ jQuery.fn.extend({
 
       // let the annotation overlay own mouse events.
       // This means that clicking links or copying text will not work.
-      $(this).css('pointer-events', 'initial');
+      $(this).css('pointer-events', 'auto');
 
       $(this).unbind( "mousedown" );
       $(this).mousedown(function(e){

data/public/js/jquery-print.js

@@ -1,3 +1,4 @@
+/* https://github.com/smparkes/jquery.print/blob/master/src/jquery.print.js */
 (function($) {
 
   function print_array(obj, opts) {
@@ -60,7 +61,7 @@
       '\\': '\\\\'
     };
     var r = /["\\\x00-\x1f\x7f-\x9f]/g;
-    
+
     var str = r.test(value)
       ? value.replace(r, function (a) {
           var c = character_substitutions[a];
@@ -106,4 +107,4 @@
       return obj.toString().replace(/\n\s*/g, '');
   }
 
-})(jQuery);
+})(jQuery);

data/public/js/{jquery.doubletap-0.1.js → jquery.doubletap-4ff02c5.js}

@@ -1,3 +1,4 @@
+/* https://github.com/technoweenie/jquery.doubletap */
 (function($) {
   var touchStatus = function(target, touch) {
     this.target    = $(target);
@@ -31,7 +32,7 @@
 
   touchStatus.prototype.checkForDoubleTap = function() {
     if(touchStatus.latestTap) {
-      if((new Date() - touchStatus.latestTap) < 400) 
+      if((new Date() - touchStatus.latestTap) < 400)
         this.eventType = 'doubletap'
     }
     if(!this.eventType) this.eventType = 'tap'
@@ -102,4 +103,4 @@
     if(callback) this.bind('touch', callback)
     return this;
   }
-})(jQuery);
+})(jQuery);

data/public/js/{jquery.parsequery.min.js → jquery.parsequery.min-6a20f83.js}

@@ -1,2 +1,3 @@
+/* https://github.com/rapportive-oss/jquery-parsequery */
 (function($){$.parseQuery=function(options){var config={query:window.location.search||""},params={};if(typeof options==='string'){options={query:options};}
 $.extend(config,$.parseQuery,options);config.query=config.query.replace(/^\?/,'');$.each(config.query.split(config.separator),function(i,param){var pair=param.split('='),key=config.decode(pair.shift(),null).toString(),value=config.decode(pair.length?pair.join('='):null,key);if(config.array_keys(key)){params[key]=params[key]||[];params[key].push(value);}else{params[key]=value;}});return params;};$.parseQuery.decode=$.parseQuery.default_decode=function(string){return decodeURIComponent((string||"").replace('+',' '));};$.parseQuery.array_keys=function(){return false;};$.parseQuery.separator="&";}(jQuery));

data/public/js/presenter.js

@@ -1,6 +1,6 @@
 // presenter js
 var slaveWindow = null;
-var nextWindow = null;
+var nextWindow  = null;
 var notesWindow = null;
 
 var paceData = [];
@@ -9,7 +9,7 @@ section = 'notes'; // which section the presenter has chosen to view
 
 $(document).ready(function(){
   // set up the presenter modes
-  mode = { track: true, follow: true, update: true, slave: false, next: false, notes: false, annotations: false};
+  mode = { track: true, follow: true, update: true, slave: false, notes: false, annotations: false, layout: 'default'};
 
   // attempt to open another window for the presentation if the mode defaults
   // to enabling this. It does not by default, so this is likely a no-op.
@@ -32,6 +32,10 @@ $(document).ready(function(){
   $('#downloadslink').click(function(e) {
     presenterPopupToggle('/download', e);
   });
+  $('#layoutSelector').change(function(e) {
+    chooseLayout(e.target.value);
+  });
+
 
   // Bind events for mobile viewing
   if( mobile() ) {
@@ -54,6 +58,20 @@ $(document).ready(function(){
     });
   }
 
+  // wait until the presentation is loaded to hook up the previews.
+  // TODO: If we decide to implement this for the audience display, we can move it later
+  $("body").bind("showoff:loaded", function (event) {
+    $('#navigation li a.navItem').hover(function() {
+      var position = $(this).position();
+      $('#navigationHover').css({top: position.top, left: position.left + $('#navigation').width() + 5})
+      $('#navigationHover').html(slides.eq($(this).attr('rel')).html());
+      $('#navigationHover').show();
+    },function() {
+      $('#navigationHover').hide();
+    });
+  });
+
+
   // Hide with js so jquery knows what display property to assign when showing
   toggleAnnotations();
 
@@ -143,7 +161,7 @@ function presenterPopupToggle(page, event) {
 
       content.attr('id', page.substring(1, page.length));
       content.append(link);
-      /* use .sibliings() because of how jquery formats $(data) */
+      /* use .siblings() because of how jquery formats $(data) */
       content.append($(data).siblings('#wrapper').html());
       popup.append(content);
 
@@ -175,16 +193,26 @@ function openEditor() {
   $.get(link);
 }
 
+function windowIsClosed(window)
+{
+  return(window == null || typeof(window) == 'undefined' || window.closed);
+}
+
+function windowIsOpen(window) {
+  return (window && typeof(window) != 'undefined' && !window.closed)
+}
+
 function toggleSlave() {
   mode.slave = !mode.slave;
   openSlave();
 }
 
+// Open, or maintain connection & reopen slave window.
 function openSlave()
 {
   if (mode.slave) {
     try {
-      if(slaveWindow == null || typeof(slaveWindow) == 'undefined' || slaveWindow.closed){
+      if(windowIsClosed(slaveWindow)){
           slaveWindow = window.open('/' + window.location.hash, 'toolbar');
       }
       else if(slaveWindow.location.hash != window.location.hash) {
@@ -223,65 +251,21 @@ function openSlave()
 
 function nextSlideNum(url) {
   // Some fudging because the first slide is slide[0] but numbered 1 in the URL
-  console.log(typeof(url));
   var snum;
   if (typeof(url) == 'undefined') { snum = currentSlideFromParams()+1; }
   else { snum = currentSlideFromParams()+2; }
   return snum;
 }
 
-function toggleNext() {
-  mode.next = !mode.next;
-  openNext();
-}
-
-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=320,height=300');
-      }
-      else if(nextWindow.location.hash != '#' + nextSlideNum(true)) {
-        // maybe we need to reset content?
-        nextWindow.location.href = '/?track=false&feedback=false&next=true#' + nextSlideNum(true);
-      }
-
-      // maintain the pointer back to the parent.
-      nextWindow.presenterView = window;
-      nextWindow.mode = { track: false, next: true, follow: true };
-
-      $('#nextWindow').addClass('enabled');
-    }
-    catch(e) {
-      console.log('Failed to open or connect next window. Popup blocker?');
-    }
-  }
-  else {
-    try {
-      nextWindow && nextWindow.close();
-      $('#nextWindow').removeClass('enabled');
-    }
-    catch (e) {
-      console.log('Next window failed to close properly.');
-    }
-  }
-}
 
 function toggleNotes() {
   mode.notes = !mode.notes;
-  openNotes();
-}
 
-function openNotes()
-{
   if (mode.notes) {
     try {
-      if(notesWindow == null || typeof(notesWindow) == 'undefined' || notesWindow.closed){
-          // yes, the explicit address is needed. Because Chrome.
-          notesWindow = window.open('about:blank', '', 'width=350,height=450');
-          notesWindow.document.title = "Showoff Notes";
-          postSlide();
+      if(windowIsClosed(notesWindow)){
+        notesWindow = blankStyledWindow("Showoff Notes", 'width=350,height=450', 'notes', true);
+        window.setTimeout(postSlide, 500);
       }
       $('#notesWindow').addClass('enabled');
     }
@@ -300,6 +284,40 @@ function openNotes()
   }
 }
 
+function blankStyledWindow(title, dimensions, classes, resizable) {
+  // yes, the explicit address is needed. Because Chrome.
+  var opts = "status=0,toolbar=0,location=0,menubar=0,"+dimensions;
+  if(resizable) {
+    opts += ",resizable=1,scrollbars=1";
+  }
+  newWindow = window.open('about:blank','', opts);
+
+  // allow time for the window to load for Firefox and IE
+  window.setTimeout(function() {
+    newWindow.document.title = title;
+
+    // IE is terrible and will explode if you try to add a DOM element to another
+    // document. Instead, serialize everything into STRINGS and let jquery rebuild
+    // them into elements again in the context of the other document.
+    // Because IE.
+
+    $(newWindow.document.head).append('<base href="' + window.location.origin + '"/>');
+    $('link[rel="stylesheet"]').each(function() {
+      var href  = $(this).attr('href');
+      var style = '<link rel="stylesheet" type="text/css" href="' + href + '">'
+      $(newWindow.document.head).append(style);
+    });
+
+    $(newWindow.document.body).addClass('floating');
+    if(classes) {
+      $(newWindow.document.body).addClass(classes);
+    }
+
+  }, 500);
+
+  return newWindow;
+}
+
 function printSlides()
 {
   try {
@@ -422,7 +440,7 @@ function markCompleted(questionID) {
 function update() {
   if(mode.update) {
     var slideName = $("#slideFile").text();
-    ws.send(JSON.stringify({ message: 'update', slide: slidenum, name: slideName}));
+    ws.send(JSON.stringify({ message: 'update', slide: slidenum, name: slideName, increment: incrCurr}));
   }
 }
 
@@ -499,7 +517,18 @@ function postSlide() {
       $('#notes').prepend(ul);
     }
 
-    if (notesWindow && typeof(notesWindow) != 'undefined' && !notesWindow.closed) {
+    var nextIndex = slidenum + 1;
+    var nextSlide = (nextIndex >= slides.size()) ? '' : slides.eq(nextIndex).html();
+    var prevSlide = (slidenum > 0) ? slides.eq(slidenum - 1).html() : ''
+
+    $('#nextSlide .container').html(nextSlide);
+    $('#prevSlide .container').html(prevSlide);
+
+    if (windowIsOpen(nextWindow)) {
+      $(nextWindow.document.body).html(nextSlide);
+    }
+
+    if (windowIsOpen(notesWindow)) {
       $(notesWindow.document.body).html(notes);
     }
 
@@ -522,18 +551,19 @@ function presenterKeyDown(event){
   }
 
   switch(getAction(event)) {
-    case 'DEBUG':     toggleDebug();    break;
-    case 'PREV':      presPrevStep();   break; // Watch that this uses presPrevStep and not prevStep
-    case 'NEXT':      presNextStep();   break; // Same here
-    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 'PAUSE':     togglePause();    break;
-    case 'PRESHOW':   togglePreShow();  break;
+    case 'DEBUG':     toggleDebug();      break;
+    case 'PREV':      presPrevStep();     break; // Watch that this uses presPrevStep and not prevStep
+    case 'NEXT':      presNextStep();     break; // Same here
+    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 'PAUSE':     togglePause();      break;
+    case 'PRESHOW':   togglePreShow();    break;
     case 'CLEAR':
       removeResults();
       try {
@@ -722,3 +752,100 @@ function toggleAnnotations()
     $('canvas.annotations').hide();
   }
 }
+
+function openNext() {
+  $("#nextWindowConfirmation").slideUp(125);
+  try {
+    if(windowIsClosed(nextWindow)){
+      nextWindow = blankStyledWindow("Next Slide Preview", 'width=320,height=300', 'next');
+
+      // Firefox doesn't load content properly unless we delay it slightly. Yay for race conditions.
+//      nextWindow.addEventListener("unload", function() {
+      window.setTimeout(function() {
+        // call back and update the parent presenter if the window is closed
+        nextWindow.onunload = function(e) {
+          nextWindow.opener.chooseLayout('default');
+        };
+
+        postSlide();
+      }, 500);
+
+    }
+  }
+  catch(e) {
+    console.log(e);
+    console.log('Failed to open or connect next window. Popup blocker?');
+  }
+}
+
+/********************
+ Layout selection incorporates previews and the old next window
+ ********************/
+function chooseLayout(layout)
+{
+  // in case we're being called externally, make the UI match
+  $('#layoutSelector').val(layout);
+  $("#nextWindowConfirmation").slideUp(125);
+  console.log("Setting layout to " + layout);
+
+  // change focus so we don't inadvertently change layout again by changing slides
+  $("#preview").focus();
+  $("#layoutSelector").blur();
+
+  // what we are switching *from*
+  switch(mode.layout) {
+    case 'thumbs':
+      $('#preview').removeClass('thumbs');
+      $('#preview .thumb').hide();
+      break;
+
+    case 'beside':
+      $('#preview').removeClass('beside');
+      $('#preview #nextSlide .container').removeAttr("style");
+      $('#preview #nextSlide').hide();
+      break;
+
+    case 'floating':
+      try {
+        if (nextWindow) {
+          // unregister the event so we don't accidentally double-fire
+          nextWindow.window.onunload = null;
+          nextWindow.close();
+        }
+      }
+      catch (e) {
+        console.log(e);
+        console.log('Next window failed to close properly.');
+      }
+      break;
+
+    default:
+
+  }
+
+  // what we are switching *to*
+  switch(layout) {
+    case 'thumbs':
+      $('#preview').addClass('thumbs');
+      $('#preview .thumb').show();
+      break;
+
+    case 'beside':
+      $('#preview').addClass('beside');
+      $('#preview #nextSlide').show();
+
+      var w = $('#nextSlide .container').width();
+      $('#nextSlide .container').height(w*.75)
+      break;
+
+    case 'floating':
+      $("#nextWindowConfirmation").slideDown(125);
+      break;
+
+    default:
+
+  }
+
+  mode.layout = layout;
+  zoom(true);
+}