expo added hotkeys

web/themes/custom/edlptheme/assets/dist/bower/jquery.hotkeys.js

@@ -1,3 +1,6 @@
+/*jslint browser: true*/
+/*jslint jquery: true*/
+
 /*
  * jQuery Hotkeys Plugin
  * Copyright 2010, John Resig
@@ -8,106 +11,186 @@
  *
  * Original idea by:
  * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
-*/
+ */
 
-(function(jQuery){
+/*
+ * One small change is: now keys are passed by object { keys: '...' }
+ * Might be useful, when you want to pass some other data to your handler
+ */
 
-	jQuery.hotkeys = {
+(function(jQuery) {
-		version: "0.8+",
 
-		specialKeys: {
+  jQuery.hotkeys = {
-			8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
+    version: "0.8",
-			20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
-			37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del",
-			96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
-			104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/",
-			112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8",
-			120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 188: ",", 190: ".",
-			191: "/", 224: "meta"
-		},
 
-		shiftNums: {
+    specialKeys: {
-			"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&",
+      8: "backspace",
-			"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<",
+      9: "tab",
-			".": ">",  "/": "?",  "\\": "|"
+      10: "return",
-		}
+      13: "return",
-	};
+      16: "shift",
+      17: "ctrl",
+      18: "alt",
+      19: "pause",
+      20: "capslock",
+      27: "esc",
+      32: "space",
+      33: "pageup",
+      34: "pagedown",
+      35: "end",
+      36: "home",
+      37: "left",
+      38: "up",
+      39: "right",
+      40: "down",
+      45: "insert",
+      46: "del",
+      59: ";",
+      61: "=",
+      96: "0",
+      97: "1",
+      98: "2",
+      99: "3",
+      100: "4",
+      101: "5",
+      102: "6",
+      103: "7",
+      104: "8",
+      105: "9",
+      106: "*",
+      107: "+",
+      109: "-",
+      110: ".",
+      111: "/",
+      112: "f1",
+      113: "f2",
+      114: "f3",
+      115: "f4",
+      116: "f5",
+      117: "f6",
+      118: "f7",
+      119: "f8",
+      120: "f9",
+      121: "f10",
+      122: "f11",
+      123: "f12",
+      144: "numlock",
+      145: "scroll",
+      173: "-",
+      186: ";",
+      187: "=",
+      188: ",",
+      189: "-",
+      190: ".",
+      191: "/",
+      192: "`",
+      219: "[",
+      220: "\\",
+      221: "]",
+      222: "'"
+    },
 
-	function keyHandler( handleObj ) {
+    shiftNums: {
+      "`": "~",
+      "1": "!",
+      "2": "@",
+      "3": "#",
+      "4": "$",
+      "5": "%",
+      "6": "^",
+      "7": "&",
+      "8": "*",
+      "9": "(",
+      "0": ")",
+      "-": "_",
+      "=": "+",
+      ";": ": ",
+      "'": "\"",
+      ",": "<",
+      ".": ">",
+      "/": "?",
+      "\\": "|"
+    },
 
-		var origHandler = handleObj.handler,
+    // excludes: button, checkbox, file, hidden, image, password, radio, reset, search, submit, url
-			//use namespace as keys so it works with event delegation as well
+    textAcceptingInputTypes: [
-			//will also allow removing listeners of a specific key combination
+      "text", "password", "number", "email", "url", "range", "date", "month", "week", "time", "datetime",
-			//and support data objects
+      "datetime-local", "search", "color", "tel"],
-			keys = (handleObj.namespace || "").toLowerCase().split(" ");
-			keys = jQuery.map(keys, function(key) { return key.split("."); });
 
-		//no need to modify handler if no keys specified
+    options: {
-		//Added keys[0].substring(0, 12) to work with jQuery ui 1.9.0
+      filterTextInputs: true
-		//Added accordion, tabs and menu, then jquery ui can use keys.
+    }
+  };
 
-			if (keys.length === 1 && (keys[0] === "" || 
+  function keyHandler(handleObj) {
-			keys[0].substring(0, 12) === "autocomplete"  || 
+    if (typeof handleObj.data === "string") {
-			keys[0].substring(0, 9) === "accordion"  || 
+      handleObj.data = {
-			keys[0].substring(0, 4) === "tabs"  || 
+        keys: handleObj.data
-			keys[0].substring(0, 4) === "menu")) {
+      };
-			return;
+    }
-		}
 
-		handleObj.handler = function( event ) {
+    // Only care when a possible input has been specified
-			// Don't fire in text-accepting inputs that we didn't directly bind to
+    if (!handleObj.data || !handleObj.data.keys || typeof handleObj.data.keys !== "string") {
-			// important to note that $.fn.prop is only available on jquery 1.6+
+      return;
-			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
+    }
-				event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) {
-				return;
-			}
 
-			// Keypress represents characters, not special keys
+    var origHandler = handleObj.handler,
-			var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ],
+      keys = handleObj.data.keys.toLowerCase().split(" ");
-				character = String.fromCharCode( event.which ).toLowerCase(),
-				key, modif = "", possible = {};
 
-			// check combinations (alt|ctrl|shift+anything)
+    handleObj.handler = function(event) {
-			if ( event.altKey && special !== "alt" ) {
+      //      Don't fire in text-accepting inputs that we didn't directly bind to
-				modif += "alt_";
+      if (this !== event.target && (/textarea|select/i.test(event.target.nodeName) ||
-			}
+          (jQuery.hotkeys.options.filterTextInputs &&
+            jQuery.inArray(event.target.type, jQuery.hotkeys.textAcceptingInputTypes) > -1))) {
+        return;
+      }
 
-			if ( event.ctrlKey && special !== "ctrl" ) {
+      var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[event.which],
-				modif += "ctrl_";
+        character = String.fromCharCode(event.which).toLowerCase(),
-			}
+        modif = "",
+        possible = {};
 
-			// TODO: Need to make sure this works consistently across platforms
+      jQuery.each(["alt", "ctrl", "shift"], function(index, specialKey) {
-			if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
-				modif += "meta_";
-			}
 
-			if ( event.shiftKey && special !== "shift" ) {
+        if (event[specialKey + 'Key'] && special !== specialKey) {
-				modif += "shift_";
+          modif += specialKey + '+';
-			}
+        }
+      });
 
-			if ( special ) {
+      // metaKey is triggered off ctrlKey erronously
-				possible[ modif + special ] = true;
+      if (event.metaKey && !event.ctrlKey && special !== "meta") {
+        modif += "meta+";
+      }
 
-			} else {
+      if (event.metaKey && special !== "meta" && modif.indexOf("alt+ctrl+shift+") > -1) {
-				possible[ modif + character ] = true;
+        modif = modif.replace("alt+ctrl+shift+", "hyper+");
-				possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;
+      }
 
-				// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
+      if (special) {
-				if ( modif === "shift_" ) {
+        possible[modif + special] = true;
-					possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
+      }
-				}
+      else {
-			}
+        possible[modif + character] = true;
+        possible[modif + jQuery.hotkeys.shiftNums[character]] = true;
 
-			for ( var i = 0, l = keys.length; i < l; i++ ) {
+        // "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
-				if ( possible[ keys[i] ] ) {
+        if (modif === "shift+") {
-					return origHandler.apply( this, arguments );
+          possible[jQuery.hotkeys.shiftNums[character]] = true;
-				}
+        }
-			}
+      }
-		};
-	}
 
-	jQuery.each([ "keydown", "keyup", "keypress" ], function() {
+      for (var i = 0, l = keys.length; i < l; i++) {
-		jQuery.event.special[ this ] = { add: keyHandler };
+        if (possible[keys[i]]) {
-	});
+          return origHandler.apply(this, arguments);
+        }
+      }
+    };
+  }
 
-})( jQuery );
+  jQuery.each(["keydown", "keyup", "keypress"], function() {
+    jQuery.event.special[this] = {
+      add: keyHandler
+    };
+  });
+
+})(jQuery || this.jQuery || window.jQuery);

web/themes/custom/edlptheme/assets/dist/scripts/main.min.js

@@ -85,9 +85,10 @@ if(this.$playpause){if(this.playlist.length>0){this.$playpause.addClass('is-acti
 if(this.$next){if(this.playing&&this.playlist.length>1&&this.current_index<this.playlist.length-1){this.$next.addClass('is-active');}else{this.$next.removeClass('is-active');}}
 if(this.$previous){if(this.playing&&this.playlist.length>1&&this.current_index>0){this.$previous.addClass('is-active');}else{this.$previous.removeClass('is-active');}}
 return this;},deactivate(){this.stop();this.active=false;},onAudioOpenDocument(args){void 0;if(args.caller!==this){this.reset();}},onAudioPlayerPlay(){if(this.playing&&this.paused){this.paused=false;this.showHideControls();}},onAudioPlayerPause(){if(this.playing&&!this.paused){this.paused=true;this.showHideControls();}},onAudioPlayerEnded(){void 0;if(this.playing){this.paused=false;this.next();}},};function initExpo(){void 0;document.title=edlp.site_name;if(window.location.hash=='#black'){$('body').addClass('expo-black');}
-_$body.on('map-node-opened',checkExpoPlayerPositionning);_randomPlayer.start();}
+_$body.on('map-node-opened',checkExpoPlayerPositionning);_randomPlayer.start();initKeyboard();}
 function checkExpoPlayerPositionning(e){void 0;switch(true){case e.node.x>window.innerWidth-800&&e.node.y<200:_audioPlayer.$container.attr('pos','bottom-left');break;case e.node.x>window.innerWidth-800:_audioPlayer.$container.attr('pos','top-left');break;case e.node.y<200:_audioPlayer.$container.attr('pos','bottom-right');break;default:_audioPlayer.$container.attr('pos','top-right');}
 _audioPlayer.$container.css({'display':"block",'left':e.node.x+"px",'top':e.node.y+"px",});}
+function initKeyboard(){$(document).bind('keyup','alt+n',function(){_randomPlayer.next();});}
 function initGrid(){void 0;if(!_is_mobile){checkGridBlockHeight();_$row.find('.col').addClass('offfield');}
 if(false){var $grid=$('.grid',_$row).masonry({itemSelector:'.col',columnWidth:'.col-2',containerStyle:null,resizeContainer:false,transitionDuration:0,});$grid.imagesLoaded().progress(function(){$grid.masonry('layout');});$grid.imagesLoaded(function(){$grid.masonry('layout');});$grid.on('layoutComplete',checkGridBlockVisible);}else{if(!_is_mobile){checkGridBlockVisible();}}};function checkGridBlockHeight(){var $r_h=_$row.height();var $this;$('.grid .col',_$row).each(function(i,e){$this=$(this);if(!$this.is('[init-height]')){$this.attr('init-height',$this.outerHeight())}
 $this.height(Math.min($this.attr('init-height'),_$row.height()));});};function checkGridBlockVisible(){var $r_h=_$row.height();var $this,pos;$('.grid .col',_$row).each(function(i,e){$this=$(this);pos=$this.position();if(pos.top+$this.height()<=$r_h){$this.removeClass('offfield');}else{$this.addClass('offfield');}});}

web/themes/custom/edlptheme/assets/scripts/main.js

@@ -1969,6 +1969,7 @@
       }
       _$body.on('map-node-opened', checkExpoPlayerPositionning);
       _randomPlayer.start();
+      initKeyboard();
     }
     function checkExpoPlayerPositionning(e){
       console.log('checkExpoPlayerPositionning', e.node);
@@ -1993,7 +1994,11 @@
         'top':e.node.y+"px",
       });
     }
-
+    function initKeyboard(){
+      $(document).bind('keyup', 'alt+n', function(){
+        _randomPlayer.next();
+      });
+    }
     //   ___     _    _
     //  / __|_ _(_)__| |
     // | (_ | '_| / _` |

web/themes/custom/edlptheme/assets/styles/app.scss

@@ -1184,6 +1184,7 @@ main[role="main"]{
           font-size: 1em;
           @include entree-micro-square-expo-player;
           span.entree{
+            margin-right:0.5em;
             &:after{
               content: attr(title);
               font-size: 0.75em;

web/themes/custom/edlptheme/edlptheme.libraries.yml

@@ -13,7 +13,7 @@ redirect-js:
 global-js:
   version: VERSION
   js:
-    # assets/dist/bower/jquery.hotkeys.js: { scope: footer }
+    assets/dist/bower/jquery.hotkeys.js: { scope: footer }
     assets/dist/bower/imagesloaded.pkgd.min.js: { minified: true }
     assets/dist/bower/masonry.pkgd.min.js: { minified: true }
     assets/dist/scripts/main.min.js: { minified: true }