From 329a8b4fd560a64f178f4beda8e3cc14cc8a94b4 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sat, 6 Jun 2020 14:58:08 +0300 Subject: [PATCH] minor fix + some cleanup... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/metadata.js | 2 +- ui (gen4)/lib/keyboard.js | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ui (gen4)/features/metadata.js b/ui (gen4)/features/metadata.js index 0b015019..ed791824 100755 --- a/ui (gen4)/features/metadata.js +++ b/ui (gen4)/features/metadata.js @@ -17,7 +17,7 @@ if(typeof(process) != 'undefined'){ // XXX EXPERIMENTAL: graph... // do this only if browser is loaded... - var graph = window != null ? + var graph = typeof(window) != 'undefined' ? requirejs('lib/components/ig-image-graph') : null } diff --git a/ui (gen4)/lib/keyboard.js b/ui (gen4)/lib/keyboard.js index 38cf88f6..c3f8c6e5 100755 --- a/ui (gen4)/lib/keyboard.js +++ b/ui (gen4)/lib/keyboard.js @@ -94,16 +94,14 @@ module.SHIFT_KEYS = { var UNSHIFT_KEYS = module.UNSHIFT_KEYS = {} for(var k in SHIFT_KEYS){ - UNSHIFT_KEYS[SHIFT_KEYS[k]] = k -} + UNSHIFT_KEYS[SHIFT_KEYS[k]] = k } // build a reverse map of SPECIAL_KEYS var KEY_CODES = module.KEY_CODES = {} for(var k in SPECIAL_KEYS){ - KEY_CODES[SPECIAL_KEYS[k]] = k -} + KEY_CODES[SPECIAL_KEYS[k]] = k } // This is used to identify and correct key notation... @@ -130,8 +128,7 @@ var SPECIAL_KEY_ALTERNATIVE_TITLES = { } var SPECIAL_KEYS_DICT = {} for(var k in SPECIAL_KEYS){ - SPECIAL_KEYS_DICT[SPECIAL_KEYS[k].toLowerCase()] = SPECIAL_KEYS[k] -} + SPECIAL_KEYS_DICT[SPECIAL_KEYS[k].toLowerCase()] = SPECIAL_KEYS[k] } @@ -143,8 +140,7 @@ module.doc = function doc(text, func){ func = !func ? function(){return true}: func func.doc = text - return func -} + return func } // Parse action call format... @@ -365,8 +361,7 @@ function normalizeKey(key){ return output == 'array' ? key - : joinKey(key) -} + : joinKey(key) } // Get shifted key if available... @@ -395,8 +390,7 @@ function shifted(key){ return s == null ? null : output == 'string' ? joinKey(res) - : res -} + : res }