diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-10 11:24:31 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-10 11:24:31 -0800 |
| commit | d124b9df109e55448aa2d3556a56d65e1c1982fd (patch) | |
| tree | f47c24236a53c98f4b485d1ecd023f4375e04ab5 /web/react/stores | |
| parent | 947da5d2878007a693460c7d3df29f19969683e5 (diff) | |
| parent | 6f043c5b740c9bbc6e17b4ef79da1ed29fb96668 (diff) | |
| download | chat-d124b9df109e55448aa2d3556a56d65e1c1982fd.tar.gz chat-d124b9df109e55448aa2d3556a56d65e1c1982fd.tar.bz2 chat-d124b9df109e55448aa2d3556a56d65e1c1982fd.zip | |
Merge pull request #157 from rgarmsen2295/mm-1265
MM-1265 Button to change roles now shows "click" mouse ptr when hovered over & change with loading more channels
Diffstat (limited to 'web/react/stores')
| -rw-r--r-- | web/react/stores/channel_store.jsx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx index 340ce9922..4429a5312 100644 --- a/web/react/stores/channel_store.jsx +++ b/web/react/stores/channel_store.jsx @@ -202,16 +202,17 @@ var ChannelStore = assign({}, EventEmitter.prototype, { BrowserStore.setItem("more_channels", JSON.stringify(channels)); }, _getMoreChannels: function() { - var channels; + var channels = null; try { channels = JSON.parse(BrowserStore.getItem("more_channels")); } catch (err) { } - if (channels == null) { - channels = []; - } + if (channels == null) { + channels = {}; + channels.loading = true; + } return channels; }, |