From 95a1540dffe1c279b109e73b47f016e6b8d4a663 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Thu, 9 Jul 2015 16:25:57 -0700 Subject: Leave result of _getMoreChannels unitialized if it does not yet exist in browser storage to know when list of more channels is loading vs when its empty --- web/react/stores/channel_store.jsx | 4 ---- 1 file changed, 4 deletions(-) (limited to 'web/react/stores') diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx index 340ce9922..f6b8fecd4 100644 --- a/web/react/stores/channel_store.jsx +++ b/web/react/stores/channel_store.jsx @@ -209,10 +209,6 @@ var ChannelStore = assign({}, EventEmitter.prototype, { catch (err) { } - if (channels == null) { - channels = []; - } - return channels; }, _storeExtraInfos: function(extraInfos) { -- cgit v1.2.3-1-g7c22 From 2a1cdc68c8639ae21b00f29fa372359489cfedcc Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Fri, 10 Jul 2015 11:48:52 -0700 Subject: Better logic for checking if channel has loaded --- web/react/stores/channel_store.jsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'web/react/stores') diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx index f6b8fecd4..4429a5312 100644 --- a/web/react/stores/channel_store.jsx +++ b/web/react/stores/channel_store.jsx @@ -202,13 +202,18 @@ 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 = {}; + channels.loading = true; + } + return channels; }, _storeExtraInfos: function(extraInfos) { -- cgit v1.2.3-1-g7c22