Merge lp://staging/~bcsaller/juju-gui/zoomkbd into lp://staging/juju-gui/experimental

Reviewers: mp+166875_code.launchpad.net,

Message:
Please take a look.

Description:
Improve hotkey handler

Better keycode support
Ignore hotkeys in form fields

https://code.launchpad.net/~bcsaller/juju-gui/zoomkbd/+merge/166875

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/9906044/

Affected files:
   A [revision details]
   M app/app.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: app/app.js
=== modified file 'app/app.js'
--- app/app.js 2013-05-28 12:43:25 +0000
+++ app/app.js 2013-05-31 18:07:02 +0000
@@ -197,11 +197,11 @@
          },
          help: 'Navigate to the Environment overview.'
        },
- '+': {
+ 'S-+': {
          fire: 'zoom_in',
          help: 'Zoom In'
        },
- '-': {
+ 'S--': {
          fire: 'zoom_out',
          help: 'Zoom Out'
        },
@@ -284,12 +284,22 @@
        });
        this._keybindings = Y.one(window).on('keydown', function(evt) {
          //Normalize key-code
+ var source = evt.target.getDOMNode();
+ // Target filtering, we want to listen on window
+ // but not honor hotkeys when focused on
+ // text oriented input fields
+ if (['INPUT', 'TEXTAREA'].indexOf(source.tagName) !== -1) {
+ return;
+ }
          var symbolic = [];
          if (evt.ctrlKey) { symbolic.push('C');}
          if (evt.altKey) { symbolic.push('A');}
          if (evt.shiftKey) { symbolic.push('S');}
- symbolic.push(code_map[evt.keyCode] ||
- String.fromCharCode(evt.keyCode).toLowerCase());
+ if (code_map[evt.keyCode]) {
+ symbolic.push(code_map[evt.which]);
+ } else {
+ symbolic.push(String.fromCharCode(evt.which).toLowerCase());
+ }
          var trigger = symbolic.join('-');
          var spec = this.keybindings[trigger];
          if (spec) {

LGTM!

https://codereview.appspot.com/9906044/

*** Submitted:

Improve hotkey handler

Better keycode support
Ignore hotkeys in form fields

R=jeff.pihach, benji
CC=
https://codereview.appspot.com/9906044

https://codereview.appspot.com/9906044/