From 0fe8140fd3356914cd7b687d334f2e0de1083564 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Tue, 7 Feb 2017 18:58:37 +0300 Subject: [PATCH] minor tweak... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/filesystem.js | 1 + ui (gen4)/features/keyboard.js | 1 + ui (gen4)/imagegrid/file.js | 3 +++ ui (gen4)/lib/keyboard.js | 1 + ui (gen4)/package.json | 5 +++-- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ui (gen4)/features/filesystem.js b/ui (gen4)/features/filesystem.js index 30d07ed0..2ef5404a 100755 --- a/ui (gen4)/features/filesystem.js +++ b/ui (gen4)/features/filesystem.js @@ -14,6 +14,7 @@ if(typeof(process) != 'undefined'){ var fse = requirejs('fs-extra') var pathlib = requirejs('path') var glob = requirejs('glob') + var wglob = requirejs('wildglob') var file = require('imagegrid/file') } diff --git a/ui (gen4)/features/keyboard.js b/ui (gen4)/features/keyboard.js index 68118cd6..5903fe85 100755 --- a/ui (gen4)/features/keyboard.js +++ b/ui (gen4)/features/keyboard.js @@ -244,6 +244,7 @@ module.GLOBAL_KEYBOARD = { // navigation... Left: 'prevImage', + shift_Space: 'Left', Backspace: 'Left', Right: 'nextImage', Space: 'Right', diff --git a/ui (gen4)/imagegrid/file.js b/ui (gen4)/imagegrid/file.js index 3c9e5def..01eadd57 100755 --- a/ui (gen4)/imagegrid/file.js +++ b/ui (gen4)/imagegrid/file.js @@ -12,7 +12,9 @@ if(typeof(process) != 'undefined'){ var events = requirejs('events') var fse = requirejs('fs-extra') + var glob = requirejs('glob') + var wglob = requirejs('wildglob') var guaranteeEvents = requirejs('guarantee-events') @@ -89,6 +91,7 @@ module.gGlob = function(){ return guaranteeGlobEvents(glob.apply(null, arguments)) } + /*********************************************************************/ // Reader... diff --git a/ui (gen4)/lib/keyboard.js b/ui (gen4)/lib/keyboard.js index 26f7fffa..5151deb6 100755 --- a/ui (gen4)/lib/keyboard.js +++ b/ui (gen4)/lib/keyboard.js @@ -781,6 +781,7 @@ var KeyboardPrototype = { handler = modifiers .filter(function(m){ + console.log('>>>>', handler) return handler.indexOf(m) < 0 && seen.indexOf(m+handler) < 0 && m+handler in bindings }) diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index 4eb969d0..b1c00caa 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -22,12 +22,13 @@ "fs-walk": "^0.0.1", "glob": "^4.0.6", "guarantee-events": "^1.0.0", - "ig-features": "^2.0.0", "ig-actions": "^3.0.0", + "ig-features": "^2.0.0", "ig-object": "^1.0.1", "openseadragon": "^2.1.0", "requirejs": "^2.1.23", - "sharp": "^0.17.0" + "sharp": "^0.17.0", + "wildglob": "^0.1.1" }, "optionalDependencies": { "flickrapi": "^0.3.28"