parade 0.8.0 → 0.8.1

data/lib/public/js/keyboard.js

@@ -8,12 +8,17 @@
  * Licenced under the BSD License.
  * See https://raw.github.com/RobertWHurst/KeyboardJS/master/license.txt
  */
-(function(context, factory) {
+
+window.KeyboardCreate = function(name) {
+  createKeyboard(name,this,keyboardFactory);
+}
+
+createKeyboard = function(name, context, factory) {
   var namespaces = [], previousValues = {}, library;
   if(typeof define === 'function' && define.amd) {
     define(function() { return factory('amd'); });
   } else {
-    library = factory('global');
+    library = factory('global',name);
     library.noConflict = function(    ) {
       var args, nI;
       newNamespaces = Array.prototype.slice.apply(arguments);
@@ -33,10 +38,12 @@
       namespaces = newNamespaces;
       return namespaces;
     };
-    library.noConflict('KeyboardJS', 'k');
+    library.noConflict(name);
   }
-})(this, function(env) {
-  var KeyboardJS = {}, locales, locale, map, macros, activeKeys = [], bindings = [], activeBindings = [], activeMacros = [];
+};
+
+keyboardFactory = function(env) {
+  var keyboardJS = {}, locales, locale, map, macros, activeKeys = [], bindings = [], activeBindings = [], activeMacros = [];
 
   //INDEXOF POLLYFILL
   [].indexOf||(Array.prototype.indexOf=function(a,b,c){for(c=this.length,b=(c+~~b)%c;b<c&&(!(b in this)||this[b]!==a);b++);return b^c?b:-1;});
@@ -218,7 +225,7 @@
     }
 
     //If you create a new locale please submit it as a pull request or post it in the issue tracker at
-    // http://github.com/RobertWhurst/KeyboardJS/issues/
+    // http://github.com/RobertWhurst/keyboardJS/issues/
   };
   locale = 'us';
   map = locales[locale].map;
@@ -235,39 +242,39 @@
     throw new Error('Cannot bind to keydown event. Both addEventListener and attachEvent are unsupported by your browser.');
   }
 
-  KeyboardJS.enable = function() {
-    KeyboardJS.enabled = true;
+  keyboardJS.enable = function() {
+    keyboardJS.enabled = true;
   };
 
-  KeyboardJS.disable = function() {
-    KeyboardJS.enabled = false;
+  keyboardJS.disable = function() {
+    keyboardJS.enabled = false;
   };
 
-  KeyboardJS.toggle = function() {
-    KeyboardJS.enabled = !KeyboardJS.enabled;
+  keyboardJS.toggle = function() {
+    keyboardJS.enabled = !keyboardJS.enabled;
   };
 
-  KeyboardJS.enabled = true;
-  KeyboardJS.activeKeys = getActiveKeys;
-  KeyboardJS.on = createBinding;
-  KeyboardJS.clear = removeBindingByKeyCombo;
-  KeyboardJS.clear.key = removeBindingByKeyName;
-  KeyboardJS.locale = getSetLocale;
-  KeyboardJS.locale.register = registerLocale;
-  KeyboardJS.macro = createMacro;
-  KeyboardJS.macro.remove = removeMacro;
-  KeyboardJS.getKey = getKeyName;
-  KeyboardJS.combo = {};
-  KeyboardJS.combo.parse = parseKeyCombo;
-  KeyboardJS.combo.stringify = stringifyKeyCombo;
+  keyboardJS.enabled = true;
+  keyboardJS.activeKeys = getActiveKeys;
+  keyboardJS.on = createBinding;
+  keyboardJS.clear = removeBindingByKeyCombo;
+  keyboardJS.clear.key = removeBindingByKeyName;
+  keyboardJS.locale = getSetLocale;
+  keyboardJS.locale.register = registerLocale;
+  keyboardJS.macro = createMacro;
+  keyboardJS.macro.remove = removeMacro;
+  keyboardJS.getKey = getKeyName;
+  keyboardJS.combo = {};
+  keyboardJS.combo.parse = parseKeyCombo;
+  keyboardJS.combo.stringify = stringifyKeyCombo;
 
   window.map = map;
   window.macros = macros;
 
-  return KeyboardJS;
+  return keyboardJS;
 
   function keydown(event) {
-    if (!KeyboardJS.enabled) { return; }
+    if (!keyboardJS.enabled) { return; }
 
     var keyNames, kI;
     keyNames = getKeyName(event.keyCode);
@@ -279,7 +286,6 @@
     executeBindings(event);
   }
   function keyup(event) {
-    if (!KeyboardJS.enabled) { return; }
 
     var keyNames, kI;
     keyNames = getKeyName(event.keyCode);
@@ -287,13 +293,13 @@
     for(kI = 0; kI < keyNames.length; kI += 1) {
       removeActiveKey(keyNames[kI]);
     }
+    if (!keyboardJS.enabled) { return; }
     pruneMacros();
     pruneBindings(event);
   }
   function blur(event) {
-    if (!KeyboardJS.enabled) { return; }
-
     activeKeys = [];
+    if (!keyboardJS.enabled) { return; }
     pruneMacros();
     pruneBindings(event);
   }
@@ -423,7 +429,7 @@
   function removeBindingByKeyCombo(keyCombo) {
     var bI, binding, keyName;
     for(bI = 0; bI < bindings.length; bI += 1) {
-      binding = bindings[bi];
+      binding = bindings[bI];
       if(compareCombos(keyCombo, binding.keyCombo)) {
         bindings.splice(bI, 1); bI -= 1;
       }
@@ -723,11 +729,11 @@
   function getSetLocale(localeName) {
     if(!localeName) {
       if(typeof localeName !== 'string') { throw new Error('Cannot set locale. The locale name must be a string.'); }
-      if(!locales[localeName]) { throw new Error('Cannot set locale to ' + localeName + ' because it does not exist. If you would like to submit a ' + localeName + ' locale map for KeyboardJS please submit it at https://github.com/RobertWHurst/KeyboardJS/issues.'); }
+      if(!locales[localeName]) { throw new Error('Cannot set locale to ' + localeName + ' because it does not exist. If you would like to submit a ' + localeName + ' locale map for keyboardJS please submit it at https://github.com/RobertWHurst/keyboardJS/issues.'); }
       locale = localeName;
       map = locales[locale].map;
       macros = locales[locale].macros;
     }
     return locale;
   }
-});
+};

data/lib/public/js/parade-command-input.js

@@ -8,8 +8,20 @@ $(document).ready(function() {
     next : publishCommand('presentation:slide:next'),
     previous : publishCommand('presentation:slide:previous'),
     goto : function(tokens) {
-      var slide = parseInt(tokens[0]) - 1;
-      $.publish('presentation:slide:location:change',slide);
+
+      var gotoSlideNumber = undefined;
+
+      if ( parseInt(tokens[0]) > 0 && parseInt(tokens[0]) < presentation.slideTotal()) {
+        gotoSlideNumber = parseInt(tokens[0]) - 1;
+      } else if (tokens[0] == 'start') {
+        gotoSlideNumber = 0;
+      } else if (tokens[0] == 'end') {
+        gotoSlideNumber = presentation.slideTotal() - 1;
+      } else {
+        gotoSlideNumber = presentation.slides.findClosestToQuery(presentation.currentSlide.sequence,tokens[0]) - 1;
+      }
+
+      $.publish('presentation:slide:location:change',gotoSlideNumber);
     }
    };
 

data/lib/public/js/parade-command-visor.js

@@ -22,23 +22,20 @@
         var self = this;
         self.terminal = this.find('.td').terminal(eval, settings);
         var focus = false;
-        $(document.documentElement).keypress(function(e) {
-            if (e.which == 96) {
-                self.slideToggle('fast');
-                self.terminal.set_command('');
-                self.terminal.focus(focus = !focus);
-
-                if (focus) {
-                  $.publish("console:show");
-                } else {
-                  $.publish("console:hidden");
-                }
-
-                self.terminal.attr({
-                    scrollTop: self.terminal.attr("scrollHeight")
-                });
-            }
-        });
+
+        self.toggle = function(focus) {
+          self.slideToggle('fast');
+          self.terminal.set_command('');
+          self.terminal.focus(focus);
+
+          self.terminal.attr({
+              scrollTop: self.terminal.attr("scrollHeight")
+          });
+        }
+
+        $.subscribe("console:show", function() { self.toggle(true); });
+        $.subscribe("console:hidden", function() { self.toggle(false); });
+
         $('body').data('tilda', this);
         this.hide();
         return self;
@@ -76,7 +73,7 @@ $(document).ready(function() {
    },
    commands: TerminalCommands
   }
-  
+
   $('#tilda').tilda(function(command, terminal) {
     if (command.length == 0) { return; }
 

data/lib/public/js/parade-keyboard-input.js

@@ -4,51 +4,105 @@
 
 $(document).ready(function() {
 
-  $.subscribe("console:show",function() {
-    KeyboardJS.disable();
-  });
+  KeyboardCreate('MainKeyboard');
 
-  $.subscribe("console:hidden",function() {
-    KeyboardJS.enable();
+  MainKeyboard.on('graveaccent',function(){
+    $.publish("console:show");
   });
 
-  KeyboardJS.on('space, right, pagedown, down', function(){
+  MainKeyboard.on('space, right, pagedown, down', function(){
     $.publish("presentation:slide:next");
   });
 
-  KeyboardJS.on('shift + space, left, pageup, up', function(){
+  MainKeyboard.on('shift + space, left, pageup, up', function(){
     $.publish("presentation:slide:previous");
   });
 
-  KeyboardJS.on('h, ?', function(){
+  MainKeyboard.on('h, ?', function(){
     $.publish("help:toggle");
   });
 
-  KeyboardJS.on('b, f', function(){
+  MainKeyboard.on('b, f', function(){
     $.publish("presentation:footer:toggle");
   });
 
-  KeyboardJS.on('d', function(){
+  MainKeyboard.on('t, c', function(){
+    $.publish("navigation:show");
+  });
+
+  MainKeyboard.on('d', function(){
     $.publish("debug:toggle");
   });
 
-  KeyboardJS.on('n', function(){
+  MainKeyboard.on('n', function(){
     $.publish("presentation:speaker:notes:toggle");
   });
 
-  KeyboardJS.on('shift + p', function(){
+  MainKeyboard.on('shift + p', function(){
     $.publish("presentation:pause:toggle");
   });
 
-  KeyboardJS.on('p', function(){
+  MainKeyboard.on('p', function(){
     $.publish("presentation:preshow:toggle");
   });
 
-  KeyboardJS.on('enter', function(){
+  MainKeyboard.on('enter', function(){
     $.publish("code:execute:visible")
   });
 
-  KeyboardJS.on('escape', function(){
+  MainKeyboard.on('escape', function(){
     $.publish("code:execution:clear");
   });
+
+
+  KeyboardCreate('ConsoleKeyboard');
+  ConsoleKeyboard.disable();
+
+  ConsoleKeyboard.on('graveaccent',function() {
+    $.publish("console:hidden");
+  });
+
+  $.subscribe("console:show", function() {
+    setTimeout(function() { ConsoleKeyboard.enable(); }, 50 );
+    MainKeyboard.disable();
+  });
+
+  $.subscribe("console:hidden", function() {
+    setTimeout(function() { MainKeyboard.enable(); }, 50 );
+    ConsoleKeyboard.disable();
+  });
+
+  KeyboardCreate('NavigationKeyboard');
+  NavigationKeyboard.disable();
+
+  NavigationKeyboard.on('t, c, escape',function() {
+    $.publish("navigation:hidden");
+  });
+
+  NavigationKeyboard.on('down',function() {
+    $.publish("navigation:down");
+  });
+  NavigationKeyboard.on('up',function() {
+    $.publish("navigation:up");
+  });
+  NavigationKeyboard.on('left',function() {
+    $.publish("navigation:left");
+  });
+  NavigationKeyboard.on('right',function() {
+    $.publish("navigation:right")
+  });
+  NavigationKeyboard.on('enter',function() {
+    $.publish("navigation:selection");
+  });
+
+  $.subscribe("navigation:show", function() {
+    setTimeout(function() { NavigationKeyboard.enable(); }, 50 );
+    MainKeyboard.disable();
+  });
+
+  $.subscribe("navigation:hidden", function() {
+    setTimeout(function() { MainKeyboard.enable(); }, 50 );
+    NavigationKeyboard.disable();
+  });
+
 });

data/lib/public/js/parade.js

@@ -1,47 +1,3 @@
-function ListMenu(s) {
-  this.slide = s
-  this.typeName = 'ListMenu'
-  this.itemLength = 0;
-  this.items = new Array();
-  this.addItem = function (key, text, slide) {
-    if (key.length > 1) {
-      thisKey = key.shift()
-      if (!this.items[thisKey]) {
-        this.items[thisKey] = new ListMenu(slide)
-      }
-      this.items[thisKey].addItem(key, text, slide)
-    } else {
-      thisKey = key.shift()
-      this.items[thisKey] = new ListMenuItem(text, slide)
-    }
-  }
-  this.getList = function() {
-    var newMenu = $("<ul>")
-    for(var i in this.items) {
-      var item = this.items[i]
-      var domItem = $("<li>")
-      if (item.typeName == 'ListMenu') {
-        choice = $("<a rel=\"" + (item.slide - 1) + "\" href=\"#\">" + i + "</a>")
-        domItem.append(choice)
-        domItem.append(item.getList())
-      }
-      if (item.typeName == 'ListMenuItem') {
-        choice = $("<a rel=\"" + (item.slide - 1) + "\" href=\"#\">" + item.slide + '. ' + item.textName + "</a>")
-        domItem.append(choice)
-      }
-      newMenu.append(domItem)
-    }
-    return newMenu
-  }
-}
-
-function ListMenuItem(t, s) {
-  this.typeName = "ListMenuItem"
-  this.slide = s
-  this.textName = t
-}
-
-
 $(document).ready(function() {
 
   window.Preshow = Spine.Class.create({
@@ -270,6 +226,23 @@ $(document).ready(function() {
       this.maxSlides = arguments[2];
 
       this.transition = this.htmlContent.attr('data-transition');
+      this.sequence = parseInt(this.htmlContent.attr('data-sequence'));
+      this.title = this.htmlContent.attr('data-title');
+
+      if (this.title === undefined) {
+        this.title = this.htmlContent.text().trim().split("\n")[0];
+
+        if (this.title.length > 20) {
+          this.title = this.title.substr(0,15) + "...";
+        }
+
+      }
+
+      this.sections = [];
+
+      if (this.htmlContent.attr('data-sections') != undefined) {
+        this.sections = this.htmlContent.attr('data-sections').split(',');
+      }
 
       this.increments = this.htmlContent.find(".incremental > ul > li");
       this.currentIncrement = 0;
@@ -289,7 +262,11 @@ $(document).ready(function() {
       var increment = this.increments.eq(incrementIndex);
 
       if (this.codeIncremental && increment.hasClass('command')) {
-        increment.css('visibility', 'visible').jTypeWriter({duration:1.0});
+
+        var typeInputOverDuration = increment.find('.input').text().length / 24;
+
+        increment.find('.prompt').css('visibility', 'visible');
+        increment.find('.input').css('visibility', 'visible').jTypeWriter({duration:typeInputOverDuration});
       } else {
         increment.css('visibility', 'visible');
       }
@@ -354,6 +331,34 @@ $(document).ready(function() {
     },
     at: function(index) {
       return new Slide($(this.slides.eq(index)),index,this.size());
+    },
+    find: function(query) {
+      var regexQuery = new RegExp(query,"i");
+      var matchedSlideNumbers = [];
+      for (var index = 0; index < this.size(); index++) {
+        var slide = this.at(index);
+        // console.log(slide.title + " " + regexQuery);
+        if (regexQuery.exec(slide.title)) { matchedSlideNumbers.push(slide.sequence); }
+      }
+      console.log("Found: " + matchedSlideNumbers);
+      return matchedSlideNumbers;
+    },
+    findClosestToQuery: function(position,query) {
+      console.log('Finding the query `' + query + '` next to position ' + position);
+      var matchingSlides = this.find(query);
+
+      var closestPosition = matchingSlides[0];
+      console.log('Defaulting to ' + closestPosition);
+
+      for (var mI = 0; mI < matchingSlides.length; mI++) {
+        if (matchingSlides[mI] > position) {
+          console.log('Setting movement to ' + matchingSlides[mI]);
+          closestPosition = matchingSlides[mI];
+          break;
+        }
+      }
+
+      return closestPosition;
     }
   });
 
@@ -364,19 +369,14 @@ $(document).ready(function() {
     },
     populate: function(slides) {
 
-      var menu = new ListMenu()
-
-      slides.each(function(slideCount, slideElement) {
-
-        // TODO: by default the menu is populated with the html,
-        //  allow the user to specify some metadata
-
-        content = $(slideElement).children(".content")
-        shortTitle = $(content).text().substr(0, 20)
-        path = $(content).attr('ref').split('/')
+      var menu = new ListMenu();
 
-        menu.addItem(path, shortTitle, slideCount + 1)
-      })
+      for (var i = 0; i < slides.size(); i++) {
+        var slide = slides.at(i);
+        var sectionsMinusRoot = slide.sections.slice(1,slide.sections.length);
+        sectionsMinusRoot.push(slide.sequence);
+        menu.addItem(sectionsMinusRoot, slide.title, slide.sequence);
+      }
 
       this.menuView.html(menu.getList());
 
@@ -397,9 +397,60 @@ $(document).ready(function() {
     },
     open: function() {
       this.element.trigger('click');
+    },
+    createMenu: function(slide) {
+      console.log(this);
+      function menu(slide) {
+        console.log(this);
+      }
     }
   });
 
+  function ListMenu(slide) {
+    this.slide = slide
+    this.typeName = 'ListMenu'
+    this.itemLength = 0;
+    this.items = new Array();
+
+    this.addItem = function (key, text, slide) {
+      if (key.length > 1) {
+        thisKey = key.shift()
+        if (!this.items[thisKey]) {
+          this.items[thisKey] = new ListMenu(slide)
+        }
+        this.items[thisKey].addItem(key, text, slide)
+      } else {
+        thisKey = key.shift()
+        this.items[thisKey] = new ListMenuItem(text, slide)
+      }
+    }
+
+    this.getList = function() {
+      var newMenu = $("<ul>");
+      for(var i in this.items) {
+        var item = this.items[i];
+        var domItem = $("<li>");
+        if (item.typeName == 'ListMenu') {
+          choice = $("<a rel=\"" + (item.slide - 1) + "\" href=\"#\">" + i + "</a>");
+          domItem.append(choice);
+          domItem.append(item.getList());
+        }
+        if (item.typeName == 'ListMenuItem') {
+          choice = $("<a rel=\"" + (item.slide - 1) + "\" href=\"#\">" + item.slide + '. ' + item.textName + "</a>");
+          domItem.append(choice);
+        }
+        newMenu.append(domItem);
+      }
+      return newMenu;
+    }
+
+  }
+
+  function ListMenuItem(t, s) {
+    this.typeName = "ListMenuItem"
+    this.slide = s
+    this.textName = t
+  }
 
   window.Presentation = Spine.Class.create({
     slides: new Slides(),
@@ -421,7 +472,6 @@ $(document).ready(function() {
 
       this.slides.show();
 
-      // TODO: Another entity to center the slides should be put in place
       this.centerSlides();
 
       // Copy the slides into the presentation area
@@ -434,7 +484,8 @@ $(document).ready(function() {
       });
 
       this.navigationMenu.hide();
-      this.navigationMenu.populate(this.slides.slides);
+
+      this.navigationMenu.populate(this.slides);
 
       $.subscribe("presentation:slide:location:change",$.proxy(function(event,slideIndex) {
         this.gotoSlide(slideIndex);
@@ -481,7 +532,6 @@ $(document).ready(function() {
 
     },
     centerSlides: function() {
-      console.log("Centering Slides");
       var presentation = this;
       this.slides.slides.each(function(s,slide) {
         presentation.centerSlide(slide);
@@ -489,13 +539,17 @@ $(document).ready(function() {
     },
     centerSlide: function(slide) {
       var slideObject = $(slide);
-      var slide_content = slideObject.children(".content").first();
-      var height = slide_content.height();
-      var margin_top = (0.5 * parseFloat(slideObject.height())) - (0.5 * parseFloat(height));
-      if (margin_top < 0) {
-        margin_top = 0;
+      var slideContent = slideObject.children(".content.vertical-center").first();
+
+      if (slideContent) {
+        var height = slideContent.height();
+        var marginTop = (0.5 * parseFloat(slideObject.height())) - (0.5 * parseFloat(height));
+        if (marginTop < 0) {
+          marginTop = 0;
+        }
+        slideContent.css('margin-top', marginTop);
       }
-      slide_content.css('margin-top', margin_top);
+
     },
     showFirstSlide: function() {
       this.slidenum = WindowToSlideLocation.location();
@@ -529,30 +583,38 @@ $(document).ready(function() {
     showSlide: function() {
 
       if(this.slidenum < 0) {
-        this.slidenum = 0
-        return
+        this.slidenum = 0;
+        return;
       }
 
       var maxSlides = this.slideTotal();
 
       if(this.slidenum > (maxSlides - 1)) {
-        this.slidenum = maxSlides - 1
-        return
+        this.slidenum = maxSlides - 1;
+        return;
       }
 
       var currentSlide = this.currentSlide;
+      var futureSlide = this.slides.at(this.slidenum);
 
-      var transition = currentSlide.transition;
-      var slideIsFullPage = currentSlide.isFullPage();
+      var transition = futureSlide.transition;
+      var slideIsFullPage = futureSlide.isFullPage();
 
       if (slideIsFullPage) {
         transition = 'none';
       }
 
+      // currentSlide.trigger("parade:willDisappear");
+      // futureSlide.trigger("parade:willAppear");
+
+      $.publish('code:execution:clear');
       $.publish("presentation:slide:willChange",[ this.slidenum, maxSlides ]);
       this.presentationFrame.cycle(this.slidenum, transition);
+      this.currentSlide = futureSlide;
       $.publish("presentation:slide:didChange",[ this.slidenum, maxSlides ]);
 
+      currentSlide.trigger("parade:didDisappear");
+
       if (slideIsFullPage) {
         this.presentationFrame.css({'width' : '100%', 'overflow' : 'visible'});
         currentSlide.goFullPage();
@@ -562,11 +624,10 @@ $(document).ready(function() {
 
       WindowToSlideLocation.updateLocation(this.slidenum + 1);
 
-      $.publish('code:execution:clear');
-
-      currentSlide.trigger("parade:show");
+      // futureSlide.trigger("parade:didAppear");
+      futureSlide.trigger("parade:show");
 
-      return currentSlide.notes();
+      return futureSlide.notes();
     },
     nextStep: function() {
 
@@ -664,12 +725,4 @@ $(document).ready(function() {
   /* window.onscroll = scrolled; */
   /* window.onunload = unloaded; */
 
-  $('buttonNav.prev').click(function(){
-    $.publish("presentation:slide:previous");
-  });
-
-  $('buttonNav.next').click(function(){
-    $.publish("presentation:slide:next");
-  });
-
 });