diff options
| author | Ryan Wang <R-Wang97@users.noreply.github.com> | 2017-04-03 21:27:14 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-03 21:27:14 -0400 |
| commit | 169c490892041a7551b167e5f7ab4859ab003bae (patch) | |
| tree | 821a7631d59681a87d7f8b47bc1c622018b85326 | |
| parent | 1bcb5cdb9d6de7690edf271da5eedc6fb74789d9 (diff) | |
| download | chat-169c490892041a7551b167e5f7ab4859ab003bae.tar.gz chat-169c490892041a7551b167e5f7ab4859ab003bae.tar.bz2 chat-169c490892041a7551b167e5f7ab4859ab003bae.zip | |
Save recently used emojis after logout (#5926)
| -rw-r--r-- | webapp/stores/browser_store.jsx | 6 | ||||
| -rw-r--r-- | webapp/stores/emoji_store.jsx | 5 | ||||
| -rw-r--r-- | webapp/utils/constants.jsx | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/webapp/stores/browser_store.jsx b/webapp/stores/browser_store.jsx index fcd177662..2da6b896f 100644 --- a/webapp/stores/browser_store.jsx +++ b/webapp/stores/browser_store.jsx @@ -3,6 +3,7 @@ import {browserHistory} from 'react-router/es6'; import * as Utils from 'utils/utils.jsx'; +import Constants from 'utils/constants.jsx'; const notSupportedParams = { title: Utils.localizeMessage('error.not_supported.title', 'Browser not supported'), @@ -151,10 +152,15 @@ class BrowserStoreClass { const serverVersion = this.getLastServerVersion(); const landingPageSeen = this.hasSeenLandingPage(); const selectedTeams = this.getItem('selected_teams'); + const recentEmojis = localStorage.getItem(Constants.RECENT_EMOJI_KEY); sessionStorage.clear(); localStorage.clear(); + if (recentEmojis) { + localStorage.setItem(Constants.RECENT_EMOJI_KEY, recentEmojis); + } + if (logoutId) { sessionStorage.setItem('__logout__', logoutId); } diff --git a/webapp/stores/emoji_store.jsx b/webapp/stores/emoji_store.jsx index 444a27c72..432c176d2 100644 --- a/webapp/stores/emoji_store.jsx +++ b/webapp/stores/emoji_store.jsx @@ -10,7 +10,6 @@ import * as Emoji from 'utils/emoji.jsx'; const ActionTypes = Constants.ActionTypes; const CHANGE_EVENT = 'changed'; -const RECENT_EMOJI_KEY = 'recentEmojis'; const MAXIMUM_RECENT_EMOJI = 27; // Wrap the contents of the store so that we don't need to construct an ES6 map where most of the content @@ -171,11 +170,11 @@ class EmojiStore extends EventEmitter { if (recentEmojis.length > MAXIMUM_RECENT_EMOJI) { recentEmojis.splice(0, recentEmojis.length - MAXIMUM_RECENT_EMOJI); } - localStorage.setItem(RECENT_EMOJI_KEY, JSON.stringify(recentEmojis)); + localStorage.setItem(Constants.RECENT_EMOJI_KEY, JSON.stringify(recentEmojis)); } getRecentEmojis() { - const result = JSON.parse(localStorage.getItem(RECENT_EMOJI_KEY)); + const result = JSON.parse(localStorage.getItem(Constants.RECENT_EMOJI_KEY)); if (!result) { return []; } diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index 4f00a8559..5b4ab6611 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -903,6 +903,7 @@ export const Constants = { MIN_HASHTAG_LINK_LENGTH: 3, CHANNEL_SCROLL_ADJUSTMENT: 100, EMOJI_PATH: '/static/emoji', + RECENT_EMOJI_KEY: 'recentEmojis', DEFAULT_WEBHOOK_LOGO: logoWebhook, MHPNS: 'https://push.mattermost.com', MTPNS: 'http://push-test.mattermost.com', |