diff options
Diffstat (limited to 'web/react/stores/user_store.jsx')
-rw-r--r-- | web/react/stores/user_store.jsx | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index b173c9ca0..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() { @@ -164,6 +164,10 @@ class UserStoreClass extends EventEmitter { } getProfile(userId) { + if (userId === this.getCurrentId()) { + return this.getCurrentUser(); + } + return this.getProfiles()[userId]; } @@ -350,5 +354,4 @@ UserStore.dispatchToken = AppDispatcher.register((payload) => { } }); -global.window.UserStore = UserStore; -export default UserStore; +export {UserStore as default}; |