From ac5d74d42c0824b5789cc030bf39a447951e4804 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Sat, 21 Mar 2015 21:55:02 +0100
Subject: web: fix bugs

---
 web/src/js/actions.js             | 1 +
 web/src/js/components/eventlog.js | 1 +
 web/src/js/components/header.js   | 2 +-
 web/src/js/components/mainview.js | 2 ++
 web/src/js/store/view.js          | 8 +++-----
 web/src/js/utils.js               | 1 +
 6 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'web/src')

diff --git a/web/src/js/actions.js b/web/src/js/actions.js
index 64cd68a7..1b29438c 100644
--- a/web/src/js/actions.js
+++ b/web/src/js/actions.js
@@ -117,5 +117,6 @@ module.exports = {
     ConnectionActions: ConnectionActions,
     FlowActions: FlowActions,
     StoreCmds: StoreCmds,
+    SettingsActions: SettingsActions,
     Query: Query
 };
\ No newline at end of file
diff --git a/web/src/js/components/eventlog.js b/web/src/js/components/eventlog.js
index 23508275..de69462b 100644
--- a/web/src/js/components/eventlog.js
+++ b/web/src/js/components/eventlog.js
@@ -3,6 +3,7 @@ var common = require("./common.js");
 var Query = require("../actions.js").Query;
 var VirtualScrollMixin = require("./virtualscroll.js");
 var views = require("../store/view.js");
+var _ = require("lodash");
 
 var LogMessage = React.createClass({
     render: function () {
diff --git a/web/src/js/components/header.js b/web/src/js/components/header.js
index d1684fb2..eca06e74 100644
--- a/web/src/js/components/header.js
+++ b/web/src/js/components/header.js
@@ -173,7 +173,7 @@ var MainMenu = React.createClass({
         this.setQuery(d);
     },
     onInterceptChange: function (val) {
-        SettingsActions.update({intercept: val});
+        actions.SettingsActions.update({intercept: val});
     },
     render: function () {
         var filter = this.getQuery()[Query.FILTER] || "";
diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js
index 184ef49f..8eda2e9c 100644
--- a/web/src/js/components/mainview.js
+++ b/web/src/js/components/mainview.js
@@ -203,6 +203,8 @@ var MainView = React.createClass({
                     actions.FlowActions.revert(flow);
                 }
                 break;
+            case toputils.Key.SHIFT:
+                break;
             default:
                 console.debug("keydown", e.keyCode);
                 return;
diff --git a/web/src/js/store/view.js b/web/src/js/store/view.js
index 204d22da..d13822d5 100644
--- a/web/src/js/store/view.js
+++ b/web/src/js/store/view.js
@@ -14,8 +14,6 @@ var default_filt = function (elem) {
 
 function StoreView(store, filt, sortfun) {
     EventEmitter.call(this);
-    filt = filt || default_filt;
-    sortfun = sortfun || default_sort;
 
     this.store = store;
 
@@ -39,10 +37,10 @@ _.extend(StoreView.prototype, EventEmitter.prototype, {
         this.store.removeListener("recalculate", this.recalculate);
     },
     recalculate: function (filt, sortfun) {
-        filt = filt || default_filt;
-        sortfun = sortfun || default_sort;
+        filt = filt || this.filt || default_filt;
+        sortfun = sortfun || this.sortfun || default_sort;
         filt = filt.bind(this);
-        sortfun = sortfun.bind(this)
+        sortfun = sortfun.bind(this);
         this.filt = filt;
         this.sortfun = sortfun;
 
diff --git a/web/src/js/utils.js b/web/src/js/utils.js
index bcd3958d..48f69880 100644
--- a/web/src/js/utils.js
+++ b/web/src/js/utils.js
@@ -15,6 +15,7 @@ var Key = {
     TAB: 9,
     SPACE: 32,
     BACKSPACE: 8,
+    SHIFT: 16
 };
 // Add A-Z
 for (var i = 65; i <= 90; i++) {
-- 
cgit v1.2.3