diff options
author | =Corey Hulen <corey@hulen.com> | 2015-07-15 10:22:05 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-07-15 10:22:05 -0800 |
commit | e017babc5ddd66e65469326bf723d5359875c2d1 (patch) | |
tree | 0da7ee5d9f4039eeb20f70940483c40943c9aa23 /web/react/stores/team_store.jsx | |
parent | 252d0f3924dd19aa4dd1900c6c00c41c84755d1e (diff) | |
parent | 38f9e140e98123eb256968fb31f7fbb2aef978e0 (diff) | |
download | chat-e017babc5ddd66e65469326bf723d5359875c2d1.tar.gz chat-e017babc5ddd66e65469326bf723d5359875c2d1.tar.bz2 chat-e017babc5ddd66e65469326bf723d5359875c2d1.zip |
fixing merge
Diffstat (limited to 'web/react/stores/team_store.jsx')
-rw-r--r-- | web/react/stores/team_store.jsx | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/web/react/stores/team_store.jsx b/web/react/stores/team_store.jsx index c494cb5b5..b7199a4a8 100644 --- a/web/react/stores/team_store.jsx +++ b/web/react/stores/team_store.jsx @@ -63,22 +63,10 @@ var TeamStore = assign({}, EventEmitter.prototype, { this._storeTeams(teams); }, _storeTeams: function(teams) { - BrowserStore.setItem("user_teams", JSON.stringify(teams)); + BrowserStore.setItem("user_teams", teams); }, _getTeams: function() { - var teams = {}; - - try { - teams = JSON.parse(BrowserStore.getItem("user_teams")); - } - catch (err) { - } - - if (teams == null) { - teams = {}; - } - - return teams; + return BrowserStore.getItem("user_teams", {}); } }); |