From fd911b75e6a59c1050815a6c183c4eb32aaabb98 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 29 Mar 2015 01:45:37 +0100 Subject: web: global key handling --- web/src/js/components/mainview.js | 4 ++-- web/src/js/components/proxyapp.js | 24 ++++++++++++++++++++++-- web/src/js/utils.js | 1 + 3 files changed, 25 insertions(+), 4 deletions(-) (limited to 'web/src/js') diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js index 54687373..f102ed5e 100644 --- a/web/src/js/components/mainview.js +++ b/web/src/js/components/mainview.js @@ -130,7 +130,7 @@ var MainView = React.createClass({ } this.selectFlow(flows[index]); }, - onKeyDown: function (e) { + onMainKeyDown: function (e) { var flow = this.getSelected(); if (e.ctrlKey) { return; @@ -229,7 +229,7 @@ var MainView = React.createClass({ } return ( -
+
+
- + {eventlog}
diff --git a/web/src/js/utils.js b/web/src/js/utils.js index 6fc11f9e..7aaf213f 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -5,6 +5,7 @@ var actions = require("./actions.js"); //debug window.$ = $; window._ = _; +window.React = require("React/addons"); var Key = { UP: 38, -- cgit v1.2.3