From 34cc2fcd5345a66e35c65567dd7e7b28fa93ea3d Mon Sep 17 00:00:00 2001 From: ralder Date: Fri, 10 Jul 2015 04:36:16 -0700 Subject: fix bugs for pr #150 MM-895 --- web/react/stores/browser_store.jsx | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'web/react/stores') diff --git a/web/react/stores/browser_store.jsx b/web/react/stores/browser_store.jsx index b3e54cad5..82cf9a942 100644 --- a/web/react/stores/browser_store.jsx +++ b/web/react/stores/browser_store.jsx @@ -1,44 +1,52 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. - var UserStore = require('../stores/user_store.jsx'); // Also change model/utils.go ETAG_ROOT_VERSION var BROWSER_STORE_VERSION = '.1'; -module.exports.initalize = function() { +var _initialized = false; + +function _initialize() { var currentVersion = localStorage.getItem("local_storage_version"); if (currentVersion !== BROWSER_STORE_VERSION) { localStorage.clear(); sessionStorage.clear(); localStorage.setItem("local_storage_version", BROWSER_STORE_VERSION); } + _initialized = true; } module.exports.setItem = function(name, value) { + if (!_initialized) _initialize(); var user_id = UserStore.getCurrentId(); localStorage.setItem(user_id + "_" + name, value); }; module.exports.getItem = function(name) { + if (!_initialized) _initialize(); var user_id = UserStore.getCurrentId(); return localStorage.getItem(user_id + "_" + name); }; module.exports.removeItem = function(name) { + if (!_initialized) _initialize(); var user_id = UserStore.getCurrentId(); localStorage.removeItem(user_id + "_" + name); }; module.exports.setGlobalItem = function(name, value) { + if (!_initialized) _initialize(); localStorage.setItem(name, value); }; module.exports.getGlobalItem = function(name) { + if (!_initialized) _initialize(); return localStorage.getItem(name); }; module.exports.removeGlobalItem = function(name) { + if (!_initialized) _initialize(); localStorage.removeItem(name); }; @@ -53,7 +61,7 @@ module.exports.actionOnItemsWithPrefix = function (prefix, action) { var user_id = UserStore.getCurrentId(); var id_len = user_id.length; var prefix_len = prefix.length; - for (key in localStorage) { + for (var key in localStorage) { if (key.substring(id_len, id_len + prefix_len) === prefix) { var userkey = key.substring(id_len); action(userkey, BrowserStore.getItem(key)); @@ -70,8 +78,8 @@ module.exports.isLocalStorageSupported = function() { localStorage.removeItem("testLocal", '1'); return true; - } + } catch (e) { return false; } -} +}; -- cgit v1.2.3-1-g7c22