showoff 0.9.11.1 → 0.10.0

data/public/js/keyDictionary.json

@@ -0,0 +1,139 @@
+{
+	"keycodeDictionary": {
+		"0": "\\",
+		"8": "backspace",
+		"9": "tab",
+		"12": "num",
+		"13": "enter",
+		"16": "shift",
+		"17": "ctrl",
+		"18": "alt",
+		"19": "pause",
+		"20": "caps",
+		"27": "esc",
+		"32": "space",
+		"33": "pageup",
+		"34": "pagedown",
+		"35": "end",
+		"36": "home",
+		"37": "left",
+		"38": "up",
+		"39": "right",
+		"40": "down",
+		"44": "print",
+		"45": "insert",
+		"46": "delete",
+		"48": "0",
+		"49": "1",
+		"50": "2",
+		"51": "3",
+		"52": "4",
+		"53": "5",
+		"54": "6",
+		"55": "7",
+		"56": "8",
+		"57": "9",
+		"59": ";",
+		"61": "=",
+		"65": "a",
+		"66": "b",
+		"67": "c",
+		"68": "d",
+		"69": "e",
+		"70": "f",
+		"71": "g",
+		"72": "h",
+		"73": "i",
+		"74": "j",
+		"75": "k",
+		"76": "l",
+		"77": "m",
+		"78": "n",
+		"79": "o",
+		"80": "p",
+		"81": "q",
+		"82": "r",
+		"83": "s",
+		"84": "t",
+		"85": "u",
+		"86": "v",
+		"87": "w",
+		"88": "x",
+		"89": "y",
+		"90": "z",
+		"91": "cmd",
+		"92": "cmd",
+		"93": "cmd",
+		"96": "num_0",
+		"97": "num_1",
+		"98": "num_2",
+		"99": "num_3",
+		"100": "num_4",
+		"101": "num_5",
+		"102": "num_6",
+		"103": "num_7",
+		"104": "num_8",
+		"105": "num_9",
+		"106": "num_multiply",
+		"107": "num_add",
+		"108": "num_enter",
+		"109": "num_subtract",
+		"110": "num_decimal",
+		"111": "num_divide",
+		"112": "f1",
+		"113": "f2",
+		"114": "f3",
+		"115": "f4",
+		"116": "f5",
+		"117": "f6",
+		"118": "f7",
+		"119": "f8",
+		"120": "f9",
+		"121": "f10",
+		"122": "f11",
+		"123": "f12",
+		"124": "print",
+		"144": "num",
+		"145": "scroll",
+		"173": "-",
+		"186": ";",
+		"187": "=",
+		"188": ",",
+		"189": "-",
+		"190": ".",
+		"191": "/",
+		"192": "`",
+		"219": "[",
+		"220": "\\",
+		"221": "]",
+		"222": "'",
+		"223": "`",
+		"224": "cmd",
+		"225": "alt",
+		"57392": "ctrl",
+		"63289": "num"
+	},
+	"shiftedKeyDictionary": {
+		"0": ")",
+		"1": "!",
+		"2": "@",
+		"3": "#",
+		"4": "$",
+		"5": "%",
+		"6": "^",
+		"7": "&",
+		"8": "*",
+		"9": "(",
+		"/": "?",
+		".": ">",
+		",": "<",
+		"'": "\"",
+		";": ":",
+		"[": "{",
+		"]": "}",
+		"\\": "|",
+		"`": "~",
+		"=": "+",
+		"-": "_"
+	}
+}

data/public/js/presenter.js

@@ -40,38 +40,13 @@ $(document).ready(function(){
   zoom();
   $(window).resize(function() { zoom(); });
 
-  // set up tooltips
-  $('#report').tipsy({ offset: 5 });
-  $('#slaveWindow').tipsy({ offset: 5 });
-  $('#nextWindow').tipsy({ offset: 5 });
-  $('#notesWindow').tipsy({ offset: 5 });
-  $('#generatePDF').tipsy({ offset: 5 });
-  $('#onePage').tipsy({ offset: 5, gravity: 'ne' });
-
-  $('#stats').tipsy({
-    html: true,
-    width: 450,
-    trigger: 'manual',
-    gravity: 'ne',
-    opacity: 0.9,
-    offset: 5
+  $('#statslink').click(function(e) {
+    presenterPopupToggle('/stats', e);
   });
-
-  $('#downloads').tipsy({ html: true, width: 425, trigger: 'manual', gravity: 'ne', opacity: 0.9, offset: 5 });
-
-  $('#stats').click(function(e) {
-    // Using 'stats' as third parameter creates second element with id='stats'
-    // Should be renamed, along with 'downdloads' below
-    popupLoader($(this), '/stats', 'stats', e);
-  });
-  $('#downloads').click(function(e) {
-    popupLoader($(this), '/download', 'downloads', e);
+  $('#downloadslink').click(function(e) {
+    presenterPopupToggle('/download', e);
   });
 
-  $('#enableFollower').tipsy({ gravity: 'ne' });
-  $('#enableRemote').tipsy();
-  $('#zoomer').tipsy({ gravity: 'ne' });
-
   // Bind events for mobile viewing
   if( mobile() ) {
     $('#preso').unbind('tap').unbind('swipeleft').unbind('swiperight');
@@ -102,26 +77,37 @@ $(document).ready(function(){
   register();
 });
 
-function popupLoader(elem, page, id, event) {
-  var title = elem.attr('title');
+function presenterPopupToggle(page, event) {
   event.preventDefault();
-
-  if (elem.attr('open') === 'open') {
-    elem.attr('open', false);
-    elem.tipsy("hide");
+  var popup = $('#presenterPopup');
+  if (popup.length > 0) {
+    popup.slideUp(200, function () {
+      popup.remove();
+    });
   } else {
+    popup = $('<div>');
+    popup.attr('id', 'presenterPopup');
     $.get(page, function(data) {
-      var link = '<p class="newpage"><a href="' + page + '" target="_new">Open in new page...</a>';
-      var content = '<div id="' + id + '">' + $(data).find('#wrapper').html() + link + '</div>';
-
-      elem.attr('title', content);
-      elem.attr('open', true)
-      elem.tipsy("show");
-      setupStats();
-    });
+      var link = $('<a>'),
+          content = $('<div>');
+      
+      link.attr({
+        href: page,
+        target: '_new'
+      });
+      link.text('Open in a new page...');
+
+      content.attr('id', page.substring(1, page.length));
+      content.append(link);      
+      content.append($(data).find('#wrapper').html());
+      popup.append(content);
+      
+      setupStats(); // this function is in showoff.js because /stats does not load presenter.js
+      
+      $('body').append(popup);
+      popup.slideDown(200); // #presenterPopup is display: none by default      
+    }); 
   }
-
-  return false;
 }
 
 function reportIssue() {
@@ -289,31 +275,38 @@ function paceFeedback(pace) {
 
 function updatePace() {
   // pace notices expire in a few minutes
-  cutoff     = 3 * 60 * 1000;
-  expiration = new Date().getTime() - cutoff;
+  var cutoff     = 3 * 60 * 1000;
+  var expiration = new Date().getTime() - cutoff;
 
-  scale = 10; // this should max out around 5 clicks in either direction
-  sum   = 50; // start in the middle
+  var scale = 10; // this should max out around 5 clicks in either direction
+  var sum   = 50; // start in the middle
 
   // Loops through and calculates a decaying average
   for (var index = 0; index < paceData.length; index++) {
-    notice = paceData[index]
+    var notice = paceData[index];
 
     if(notice.time < expiration) {
       paceData.splice( index, 1 );
     }
     else {
-      ratio = (notice.time - expiration) / cutoff;
+      var ratio = (notice.time - expiration) / cutoff;
       sum  += (notice.pace * scale * ratio);
     }
   }
 
-  position = Math.max(Math.min(sum, 90), 10); // between 10 and 90
-  console.log("Updating pace: " + position);
+  var position = Math.max(Math.min(sum, 90), 10); // between 10 and 90
   $("#paceMarker").css({ left: position+"%" });
 
-  if(position > 75) { $("#paceFast").show() } else { $("#paceFast").hide() }
-  if(position < 25) { $("#paceSlow").show() } else { $("#paceSlow").hide() }
+  if(position > 75) { 
+    $("#paceFast").show();
+  } else { 
+    $("#paceFast").hide();
+  }
+  if(position < 25) { 
+    $("#paceSlow").show(); 
+  } else { 
+    $("#paceSlow").hide(); 
+  }
 }
 
 function zoom()
@@ -446,95 +439,75 @@ function postSlide() {
 	}
 }
 
-//  See e.g. http://www.quirksmode.org/js/keys.html for keycodes
-function keyDown(event)
-{
-	var key = event.keyCode;
-
-	if (event.ctrlKey || event.altKey || event.metaKey)
-		return true;
-
-	debug('keyDown: ' + key)
+function presenterKeyDown(event){
+  var key = event.keyCode;
 
-	if (key >= 48 && key <= 57) // 0 - 9
-	{
-		gotoSlidenum = gotoSlidenum * 10 + (key - 48);
-		return true;
-	}
+  debug('keyDown: ' + key);
+  // avoid overriding browser commands
+  if (event.ctrlKey || event.altKey || event.metaKey) {
+    return true;
+  }
 
-	if (key == 13) {
-    if (gotoSlidenum > 0) {
-      debug('go to ' + gotoSlidenum);
-      slidenum = gotoSlidenum - 1;
-      showSlide(true);
+  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 'CLEAR':
+      removeResults();
       try {
-        slaveWindow.slidenum = gotoSlidenum - 1;
-        slaveWindow.showSlide(true);
+        slaveWindow.removeResults();
       } catch (e) {}
-        gotoSlidenum = 0;
-    } else {
+      break;
+    case 'EXECUTE':
       debug('executeCode');
-      executeAnyCode();
-      try { slaveWindow.executeAnyCode(); } catch (e) {}
+      executeVisibleCodeBlock();
+      try {
+         slaveWindow.executeVisibleCodeBlock();
+      } catch (e) {}
+      break;
+    default:
+      switch (key) {
+        case 48: // 0
+        case 49: // 1
+        case 50: // 2
+        case 51: // 3
+        case 52: // 4
+        case 53: // 5
+        case 54: // 6
+        case 55: // 7
+        case 56: // 8
+        case 57: // 9
+          // concatenate numbers from previous keypress events
+          gotoSlidenum = gotoSlidenum * 10 + (key - 48);
+          break;
+        case 13: // enter/return
+          // check for a combination of numbers from previous keypress events
+          if (gotoSlidenum > 0) {
+            debug('go to ' + gotoSlidenum);
+            slidenum = gotoSlidenum - 1;
+            showSlide(true);
+            try {
+              slaveWindow.slidenum = gotoSlidenum - 1;
+              slaveWindow.showSlide(true);
+            } catch (e) {}
+            gotoSlidenum = 0;
+          }
+          break;
+        default:
+          break;
+      }
+      break;
     }
-	}
-
-	if (key == 16) // shift key
-	{
-		shiftKeyActive = true;
-	}
-
-	if (key == 32) // space bar
-	{
-		if (shiftKeyActive) {
-			presPrevStep()
-		} else {
-			presNextStep()
-		}
-	}
-	else if (key == 68) // 'd' for debug
-	{
-		debugMode = !debugMode
-		doDebugStuff()
-	}
-	else if (key == 37 || key == 33 || key == 38) // Left arrow, page up, or up arrow
-	{
-		presPrevStep();
-	}
-	else if (key == 39 || key == 34 || key == 40) // Right arrow, page down, or down arrow
-	{
-		presNextStep();
-	}
-	else if (key == 84 || key == 67)  // T or C for table of contents
-	{
-		$('#navmenu').toggle().trigger('click')
-	}
-	else if (key == 83)  // 's' for style
-	{
-		$('#stylemenu').toggle().trigger('click')
-	}
-	else if (key == 90 || key == 191) // z or ? for help
-	{
-		$('#help').toggle()
-	}
-	else if (key == 66 || key == 70) // f for footer (also "b" which is what kensington remote "stop" button sends
-	{
-		toggleFooter()
-	}
-	else if (key == 78) // 'n' for notes
-	{
-		toggleNotes()
-	}
-	else if (key == 27) // esc
-	{
-		removeResults();
-		try { slaveWindow.removeResults(); } catch (e) {}
-	}
-	else if (key == 80) // 'p' for preshow
-	{
-		try { slaveWindow.togglePreShow(); } catch (e) {}
-	}
-	return true
+  return true;
 }
 
 //* TIMER *//
@@ -602,12 +575,6 @@ function setProgressColor(progress) {
   }
 }
 
-var presSetCurrentStyle = setCurrentStyle;
-var setCurrentStyle = function(style, prop) {
-  presSetCurrentStyle(style, false);
-  try { slaveWindow.setCurrentStyle(style, false); } catch (e) {}
-}
-
 /********************
  Follower Code
  ********************/