From 5c35c2631e59f895a7b0fb6761c1cae7aee60466 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 19 Nov 2015 18:10:08 -0500 Subject: Upgrading ESLint and adding some more rules. Refactoring to meet these new rules --- web/react/stores/preference_store.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'web/react/stores') diff --git a/web/react/stores/preference_store.jsx b/web/react/stores/preference_store.jsx index f630d150d..cc353be6c 100644 --- a/web/react/stores/preference_store.jsx +++ b/web/react/stores/preference_store.jsx @@ -105,7 +105,7 @@ class PreferenceStoreClass extends EventEmitter { const action = payload.action; switch (action.type) { - case ActionTypes.RECIEVED_PREFERENCES: + case ActionTypes.RECIEVED_PREFERENCES: { const preferences = this.getAllPreferences(); for (const preference of action.preferences) { @@ -114,6 +114,8 @@ class PreferenceStoreClass extends EventEmitter { this.setAllPreferences(preferences); this.emitChange(preferences); + break; + } } } } -- cgit v1.2.3-1-g7c22 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/admin_store.jsx | 16 ++++++++-------- web/react/stores/channel_store.jsx | 18 +++++++++--------- web/react/stores/error_store.jsx | 12 ++++++------ web/react/stores/modal_store.jsx | 6 +++--- web/react/stores/post_store.jsx | 22 +++++++++++----------- web/react/stores/preference_store.jsx | 11 ++++++----- web/react/stores/search_store.jsx | 8 ++++---- web/react/stores/socket_store.jsx | 24 ++++++++++++------------ web/react/stores/team_store.jsx | 12 ++++++------ web/react/stores/user_store.jsx | 23 +++++++++++------------ 10 files changed, 76 insertions(+), 76 deletions(-) (limited to 'web/react/stores') diff --git a/web/react/stores/admin_store.jsx b/web/react/stores/admin_store.jsx index cf16d031c..704e2ced4 100644 --- a/web/react/stores/admin_store.jsx +++ b/web/react/stores/admin_store.jsx @@ -1,17 +1,17 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var EventEmitter = require('events').EventEmitter; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import EventEmitter from 'events'; -var BrowserStore = require('../stores/browser_store.jsx'); +import BrowserStore from '../stores/browser_store.jsx'; -var Constants = require('../utils/constants.jsx'); -var ActionTypes = Constants.ActionTypes; +import Constants from '../utils/constants.jsx'; +const ActionTypes = Constants.ActionTypes; -var LOG_CHANGE_EVENT = 'log_change'; -var CONFIG_CHANGE_EVENT = 'config_change'; -var ALL_TEAMS_EVENT = 'all_team_change'; +const LOG_CHANGE_EVENT = 'log_change'; +const CONFIG_CHANGE_EVENT = 'config_change'; +const ALL_TEAMS_EVENT = 'all_team_change'; class AdminStoreClass extends EventEmitter { constructor() { diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx index cc0d0d14b..1d481ada4 100644 --- a/web/react/stores/channel_store.jsx +++ b/web/react/stores/channel_store.jsx @@ -1,19 +1,19 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var EventEmitter = require('events').EventEmitter; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import EventEmitter from 'events'; var Utils; -var Constants = require('../utils/constants.jsx'); -var ActionTypes = Constants.ActionTypes; +import Constants from '../utils/constants.jsx'; +const ActionTypes = Constants.ActionTypes; -var BrowserStore = require('../stores/browser_store.jsx'); +import BrowserStore from '../stores/browser_store.jsx'; -var CHANGE_EVENT = 'change'; -var LEAVE_EVENT = 'leave'; -var MORE_CHANGE_EVENT = 'change'; -var EXTRA_INFO_EVENT = 'extra_info'; +const CHANGE_EVENT = 'change'; +const LEAVE_EVENT = 'leave'; +const MORE_CHANGE_EVENT = 'change'; +const EXTRA_INFO_EVENT = 'extra_info'; class ChannelStoreClass extends EventEmitter { constructor(props) { diff --git a/web/react/stores/error_store.jsx b/web/react/stores/error_store.jsx index 775b8e006..8fb051138 100644 --- a/web/react/stores/error_store.jsx +++ b/web/react/stores/error_store.jsx @@ -1,15 +1,15 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var EventEmitter = require('events').EventEmitter; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import EventEmitter from 'events'; -var Constants = require('../utils/constants.jsx'); -var ActionTypes = Constants.ActionTypes; +import Constants from '../utils/constants.jsx'; +const ActionTypes = Constants.ActionTypes; -var BrowserStore = require('../stores/browser_store.jsx'); +import BrowserStore from '../stores/browser_store.jsx'; -var CHANGE_EVENT = 'change'; +const CHANGE_EVENT = 'change'; class ErrorStoreClass extends EventEmitter { constructor() { 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 { diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx index a564a2435..ec01eef18 100644 --- a/web/react/stores/post_store.jsx +++ b/web/react/stores/post_store.jsx @@ -1,20 +1,20 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var EventEmitter = require('events').EventEmitter; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import EventEmitter from 'events'; -var ChannelStore = require('../stores/channel_store.jsx'); -var BrowserStore = require('../stores/browser_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); +import ChannelStore from '../stores/channel_store.jsx'; +import BrowserStore from '../stores/browser_store.jsx'; +import UserStore from '../stores/user_store.jsx'; -var Constants = require('../utils/constants.jsx'); -var ActionTypes = Constants.ActionTypes; +import Constants from '../utils/constants.jsx'; +const ActionTypes = Constants.ActionTypes; -var CHANGE_EVENT = 'change'; -var SELECTED_POST_CHANGE_EVENT = 'selected_post_change'; -var EDIT_POST_EVENT = 'edit_post'; -var POSTS_VIEW_JUMP_EVENT = 'post_list_jump'; +const CHANGE_EVENT = 'change'; +const SELECTED_POST_CHANGE_EVENT = 'selected_post_change'; +const EDIT_POST_EVENT = 'edit_post'; +const POSTS_VIEW_JUMP_EVENT = 'post_list_jump'; class PostStoreClass extends EventEmitter { constructor() { diff --git a/web/react/stores/preference_store.jsx b/web/react/stores/preference_store.jsx index cc353be6c..068bc29c2 100644 --- a/web/react/stores/preference_store.jsx +++ b/web/react/stores/preference_store.jsx @@ -1,11 +1,12 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. -const ActionTypes = require('../utils/constants.jsx').ActionTypes; -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -const BrowserStore = require('./browser_store.jsx'); -const EventEmitter = require('events').EventEmitter; -const UserStore = require('../stores/user_store.jsx'); +import Constants from '../utils/constants.jsx'; +const ActionTypes = Constants.ActionTypes; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import BrowserStore from './browser_store.jsx'; +import EventEmitter from 'events'; +import UserStore from '../stores/user_store.jsx'; const CHANGE_EVENT = 'change'; diff --git a/web/react/stores/search_store.jsx b/web/react/stores/search_store.jsx index 93b89035c..e8ab6a2ae 100644 --- a/web/react/stores/search_store.jsx +++ b/web/react/stores/search_store.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var EventEmitter = require('events').EventEmitter; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import EventEmitter from 'events'; -var BrowserStore = require('../stores/browser_store.jsx'); +import BrowserStore from '../stores/browser_store.jsx'; -var Constants = require('../utils/constants.jsx'); +import Constants from '../utils/constants.jsx'; var ActionTypes = Constants.ActionTypes; var CHANGE_EVENT = 'change'; diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx index 4efeb7c8f..f2936c50a 100644 --- a/web/react/stores/socket_store.jsx +++ b/web/react/stores/socket_store.jsx @@ -1,18 +1,18 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -const UserStore = require('./user_store.jsx'); -const PostStore = require('./post_store.jsx'); -const ChannelStore = require('./channel_store.jsx'); -const BrowserStore = require('./browser_store.jsx'); -const ErrorStore = require('./error_store.jsx'); -const EventEmitter = require('events').EventEmitter; - -const Utils = require('../utils/utils.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); - -const Constants = require('../utils/constants.jsx'); +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import UserStore from './user_store.jsx'; +import PostStore from './post_store.jsx'; +import ChannelStore from './channel_store.jsx'; +import BrowserStore from './browser_store.jsx'; +import ErrorStore from './error_store.jsx'; +import EventEmitter from 'events'; + +import * as Utils from '../utils/utils.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; + +import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; const SocketEvents = Constants.SocketEvents; diff --git a/web/react/stores/team_store.jsx b/web/react/stores/team_store.jsx index 22114ae85..26c83cc8c 100644 --- a/web/react/stores/team_store.jsx +++ b/web/react/stores/team_store.jsx @@ -1,14 +1,14 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var EventEmitter = require('events').EventEmitter; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import EventEmitter from 'events'; -var Constants = require('../utils/constants.jsx'); -var ActionTypes = Constants.ActionTypes; -var BrowserStore = require('../stores/browser_store.jsx'); +import Constants from '../utils/constants.jsx'; +const ActionTypes = Constants.ActionTypes; +import BrowserStore from '../stores/browser_store.jsx'; -var CHANGE_EVENT = 'change'; +const CHANGE_EVENT = 'change'; var Utils; function getWindowLocationOrigin() { diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index 40b64b34b..3e1871180 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -1,18 +1,18 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var EventEmitter = require('events').EventEmitter; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import EventEmitter from 'events'; -var Constants = require('../utils/constants.jsx'); -var ActionTypes = Constants.ActionTypes; -var BrowserStore = require('./browser_store.jsx'); +import Constants from '../utils/constants.jsx'; +const ActionTypes = Constants.ActionTypes; +import BrowserStore from './browser_store.jsx'; -var CHANGE_EVENT = 'change'; -var CHANGE_EVENT_SESSIONS = 'change_sessions'; -var CHANGE_EVENT_AUDITS = 'change_audits'; -var CHANGE_EVENT_TEAMS = 'change_teams'; -var CHANGE_EVENT_STATUSES = 'change_statuses'; +const CHANGE_EVENT = 'change'; +const CHANGE_EVENT_SESSIONS = 'change_sessions'; +const CHANGE_EVENT_AUDITS = 'change_audits'; +const CHANGE_EVENT_TEAMS = 'change_teams'; +const CHANGE_EVENT_STATUSES = 'change_statuses'; class UserStoreClass extends EventEmitter { constructor() { @@ -354,5 +354,4 @@ UserStore.dispatchToken = AppDispatcher.register((payload) => { } }); -global.window.UserStore = UserStore; -export default UserStore; +export {UserStore as default}; -- 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') 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