From 55b831e4e1d3db3ffcf1d40247018783ca76af8d Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 19 Nov 2015 21:12:56 -0500 Subject: Upgrading client dependancies. Upgrading to babel 6. Moving to es6 package system. --- web/react/stores/modal_store.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/react/stores/modal_store.jsx') diff --git a/web/react/stores/modal_store.jsx b/web/react/stores/modal_store.jsx index 809f83a59..45515bc9d 100644 --- a/web/react/stores/modal_store.jsx +++ b/web/react/stores/modal_store.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -const EventEmitter = require('events').EventEmitter; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import EventEmitter from 'events'; -const Constants = require('../utils/constants.jsx'); +import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; class ModalStoreClass extends EventEmitter { -- cgit v1.2.3-1-g7c22 From 34097faa13dab6ea5d7ac992842126c17ad4d2b9 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 19 Nov 2015 21:47:05 -0500 Subject: Patching strange travis eslint problem --- web/react/stores/modal_store.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/stores/modal_store.jsx') diff --git a/web/react/stores/modal_store.jsx b/web/react/stores/modal_store.jsx index 45515bc9d..69f43a5cf 100644 --- a/web/react/stores/modal_store.jsx +++ b/web/react/stores/modal_store.jsx @@ -28,7 +28,7 @@ class ModalStoreClass extends EventEmitter { handleEventPayload(payload) { // toggle event handlers should accept a boolean show/hide value and can accept a map of arguments - const {type, value, ...args} = payload.action; + const {type, value, ...args} = payload.action; //eslint-disable-line no-redeclare switch (type) { case ActionTypes.TOGGLE_IMPORT_THEME_MODAL: -- cgit v1.2.3-1-g7c22