summaryrefslogtreecommitdiffstats
path: root/web/react/dispatcher
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-11-20 09:22:16 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2015-11-20 09:22:16 -0500
commit25bc02c785167370b0e2e04ee04f305a801078c4 (patch)
tree00a8e7c9821fc8d8669fd7a908b3f70e3089c95a /web/react/dispatcher
parent3aea449b524f7bbc9bae92309fb702e04c1bf01e (diff)
parent34097faa13dab6ea5d7ac992842126c17ad4d2b9 (diff)
downloadchat-25bc02c785167370b0e2e04ee04f305a801078c4.tar.gz
chat-25bc02c785167370b0e2e04ee04f305a801078c4.tar.bz2
chat-25bc02c785167370b0e2e04ee04f305a801078c4.zip
Merge pull request #1478 from mattermost/plt-1237
PLT-1237 Upgrading dependancies
Diffstat (limited to 'web/react/dispatcher')
-rw-r--r--web/react/dispatcher/app_dispatcher.jsx13
1 files changed, 6 insertions, 7 deletions
diff --git a/web/react/dispatcher/app_dispatcher.jsx b/web/react/dispatcher/app_dispatcher.jsx
index 388e82a51..648f0fa0d 100644
--- a/web/react/dispatcher/app_dispatcher.jsx
+++ b/web/react/dispatcher/app_dispatcher.jsx
@@ -1,17 +1,16 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-var Dispatcher = require('flux').Dispatcher;
-var assign = require('object-assign');
+import * as Flux from 'flux';
-var Constants = require('../utils/constants.jsx');
-var PayloadSources = Constants.PayloadSources;
+import Constants from '../utils/constants.jsx';
+const PayloadSources = Constants.PayloadSources;
-var AppDispatcher = assign(new Dispatcher(), {
+const AppDispatcher = Object.assign(new Flux.Dispatcher(), {
handleServerAction: function performServerAction(action) {
var payload = {
source: PayloadSources.SERVER_ACTION,
- action: action
+ action
};
this.dispatch(payload);
},
@@ -19,7 +18,7 @@ var AppDispatcher = assign(new Dispatcher(), {
handleViewAction: function performViewAction(action) {
var payload = {
source: PayloadSources.VIEW_ACTION,
- action: action
+ action
};
this.dispatch(payload);
}