diff --git a/ui (gen4)/css/experimenting.css b/ui (gen4)/css/experimenting.css index 888dca00..2abc10b7 100755 --- a/ui (gen4)/css/experimenting.css +++ b/ui (gen4)/css/experimenting.css @@ -367,6 +367,12 @@ body { opacity: 0.5; margin-left: 0.5em; } +.browse-widget.key-bindings.edit .list>.key.non-action:before { + display: inline; + content: " (non-action) "; + opacity: 0.5; + margin-left: 0.5em; +} .browse-widget.key-bindings .list>.new { diff --git a/ui (gen4)/features/keyboard.js b/ui (gen4)/features/keyboard.js index b48a2f75..9cc0e4a5 100755 --- a/ui (gen4)/features/keyboard.js +++ b/ui (gen4)/features/keyboard.js @@ -732,10 +732,13 @@ var KeyboardActions = actions.Actions({ doc : (actions.keyboard.special_handlers[action] || null)) - .addClass('key ' + .addClass('key' + // special stuff... + (action in actions.keyboard.special_handlers ? - 'special-action' - : '')) + ' special-action' + : '') + // aliases... + + (o.action in actions ? '' : ' non-action')) c++ }) diff --git a/ui (gen4)/lib/keyboard2.js b/ui (gen4)/lib/keyboard2.js index 077900c2..b5d8186c 100755 --- a/ui (gen4)/lib/keyboard2.js +++ b/ui (gen4)/lib/keyboard2.js @@ -364,39 +364,7 @@ var KeyboardHandlerPrototype = { normalizeKey: KeyboardHandlerClassPrototype.normalizeKey, isKey: KeyboardHandlerClassPrototype.isKey, - /*/ XXX not sure if this is needed... - normalizeBindings: function(keyboard){ - keyboard = keyboard || this.keyboard - var that = this - var service_fields = this.service_fields - Object.keys(keyboard).forEach(function(mode){ - mode = keyboard[mode] - - Object.keys(mode).forEach(function(key){ - // skip service fields... - if(service_fields.indexOf(key) >= 0){ - return - } - - var n = that.normalizeKey(key) - - if(n != key){ - // duplicate key... - if(n in mode){ - console.warn('duplicate keys: "'+ n +'" and "'+ k +'"') - } - - mode[n] = mode[key] - delete mode[key] - } - }) - }) - return keyboard - }, - //*/ - //isModeApplicable: function(mode, keyboard, context){ return true }, - //isModeApplicable: checkGlobalMode, // Get keys for handler... //