Merged cookies fix with errors fix

dev
Gregory Pike 11 years ago
commit fa727e840c

@ -27,7 +27,7 @@ angularLocalStorage.service('localStorageService', [
try { try {
return ('localStorage' in window && window['localStorage'] !== null); return ('localStorage' in window && window['localStorage'] !== null);
} catch (e) { } catch (e) {
$rootScope.$broadcast('LocalStorageModule.notification.error',e.Description); $rootScope.$broadcast('LocalStorageModule.notification.error',e.message);
return false; return false;
} }
}; };
@ -49,7 +49,7 @@ angularLocalStorage.service('localStorageService', [
try { try {
localStorage.setItem(prefix+key, value); localStorage.setItem(prefix+key, value);
} catch (e) { } catch (e) {
$rootScope.$broadcast('LocalStorageModule.notification.error',e.Description); $rootScope.$broadcast('LocalStorageModule.notification.error',e.message);
return addToCookies(key, value); return addToCookies(key, value);
} }
return true; return true;
@ -79,7 +79,7 @@ angularLocalStorage.service('localStorageService', [
try { try {
localStorage.removeItem(prefix+key); localStorage.removeItem(prefix+key);
} catch (e) { } catch (e) {
$rootScope.$broadcast('LocalStorageModule.notification.error',e.Description); $rootScope.$broadcast('LocalStorageModule.notification.error',e.message);
return removeFromCookies(key); return removeFromCookies(key);
} }
return true; return true;
@ -103,7 +103,7 @@ angularLocalStorage.service('localStorageService', [
try { try {
removeFromLocalStorage(key.substr(prefixLength)); removeFromLocalStorage(key.substr(prefixLength));
} catch (e) { } catch (e) {
$rootScope.$broadcast('LocalStorageModule.notification.error',e.Description); $rootScope.$broadcast('LocalStorageModule.notification.error',e.message);
return clearAllFromCookies(); return clearAllFromCookies();
} }
} }
@ -118,7 +118,7 @@ angularLocalStorage.service('localStorageService', [
("cookie" in document && (document.cookie.length > 0 || ("cookie" in document && (document.cookie.length > 0 ||
(document.cookie = "test").indexOf.call(document.cookie, "test") > -1)); (document.cookie = "test").indexOf.call(document.cookie, "test") > -1));
} catch (e) { } catch (e) {
$rootScope.$broadcast('LocalStorageModule.notification.error',e.Description); $rootScope.$broadcast('LocalStorageModule.notification.error',e.message);
return false; return false;
} }
}; };
@ -149,7 +149,7 @@ angularLocalStorage.service('localStorageService', [
document.cookie = prefix + key + "=" + encodeURIComponent(value) + expiry + ", path="+cookie.path; document.cookie = prefix + key + "=" + encodeURIComponent(value) + expiry + ", path="+cookie.path;
} }
} catch (e) { } catch (e) {
$rootScope.$broadcast('LocalStorageModule.notification.error',e.Description); $rootScope.$broadcast('LocalStorageModule.notification.error',e.message);
return false; return false;
} }
return true; return true;