diff options
author | Corey Hulen <corey@hulen.com> | 2015-12-11 06:40:37 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-12-11 06:40:37 -0800 |
commit | 412b45431ac913d13fb211b693e177bc92a09ecf (patch) | |
tree | 74f7e329090541f18ab30c7bf62d21987be92629 /web/react/stores | |
parent | 607a8151de502bf45de131ef3632c741ad452333 (diff) | |
parent | c55e7895d91c9d4cd31c7cefe81319d64d7fed16 (diff) | |
download | chat-412b45431ac913d13fb211b693e177bc92a09ecf.tar.gz chat-412b45431ac913d13fb211b693e177bc92a09ecf.tar.bz2 chat-412b45431ac913d13fb211b693e177bc92a09ecf.zip |
Merge pull request #1652 from hmhealey/plt1319
PLT-1319 Fixed direct channels not being visible when no actual channel exists
Diffstat (limited to 'web/react/stores')
-rw-r--r-- | web/react/stores/preference_store.jsx | 12 | ||||
-rw-r--r-- | web/react/stores/socket_store.jsx | 9 |
2 files changed, 18 insertions, 3 deletions
diff --git a/web/react/stores/preference_store.jsx b/web/react/stores/preference_store.jsx index c9bf53bc7..543129aca 100644 --- a/web/react/stores/preference_store.jsx +++ b/web/react/stores/preference_store.jsx @@ -90,8 +90,8 @@ class PreferenceStoreClass extends EventEmitter { return preference; } - emitChange(preferences) { - this.emit(CHANGE_EVENT, preferences); + emitChange() { + this.emit(CHANGE_EVENT); } addChangeListener(callback) { @@ -106,6 +106,12 @@ class PreferenceStoreClass extends EventEmitter { const action = payload.action; switch (action.type) { + case ActionTypes.RECIEVED_PREFERENCE: { + const preference = action.preference; + this.setPreference(preference.category, preference.name, preference.value); + this.emitChange(); + break; + } case ActionTypes.RECIEVED_PREFERENCES: { const preferences = this.getAllPreferences(); @@ -114,7 +120,7 @@ class PreferenceStoreClass extends EventEmitter { } this.setAllPreferences(preferences); - this.emitChange(preferences); + this.emitChange(); break; } } diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx index d5aed40cf..24fa79ca6 100644 --- a/web/react/stores/socket_store.jsx +++ b/web/react/stores/socket_store.jsx @@ -136,6 +136,10 @@ class SocketStoreClass extends EventEmitter { handleChannelViewedEvent(msg); break; + case SocketEvents.PREFERENCE_CHANGED: + handlePreferenceChangedEvent(msg); + break; + default: } } @@ -281,6 +285,11 @@ function handleChannelViewedEvent(msg) { } } +function handlePreferenceChangedEvent(msg) { + const preference = JSON.parse(msg.props.preference); + EventHelpers.emitPreferenceChangedEvent(preference); +} + var SocketStore = new SocketStoreClass(); /*SocketStore.dispatchToken = AppDispatcher.register((payload) => { |