blob42
/
angular-local-storage
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #96 from georgebonnr/master

Browse Source 
Fix for issue #81
revert-117-master 0.0.4
Gregory Pike 10 years ago
parent 2cdbb7e5ff 1c5cabf7ac
commit b398f3bad1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File

9
angular-local-storage.js vendored
Unescape Escape View File

@ -70,7 +70,7 @@ angularLocalStorage.provider('localStorageService', function() {
var cookie = this.cookie; var cookie = this.cookie;
var notify = this.notify; var notify = this.notify;
var storageType = this.storageType; var storageType = this.storageType;
var webStorage = $window[storageType]; var webStorage;
// When Angular's $document is not available // When Angular's $document is not available
if (!$document) { if (!$document) {
@ -96,6 +96,7 @@ angularLocalStorage.provider('localStorageService', function() {
// that exceeded the quota." // that exceeded the quota."
var key = deriveQualifiedKey('__' + Math.round(Math.random() * 1e7)); var key = deriveQualifiedKey('__' + Math.round(Math.random() * 1e7));
if (supported) { if (supported) {
webStorage = $window[storageType];
webStorage.setItem(key, ''); webStorage.setItem(key, '');
webStorage.removeItem(key); webStorage.removeItem(key);
} }
@ -107,6 +108,8 @@ angularLocalStorage.provider('localStorageService', function() {
return false; return false;
} }
}()); }());
// Directly adds a value to local storage // Directly adds a value to local storage
// If local storage is not available in the browser use cookies // If local storage is not available in the browser use cookies
@ -131,7 +134,7 @@ angularLocalStorage.provider('localStorageService', function() {
if (angular.isObject(value) || angular.isArray(value)) { if (angular.isObject(value) || angular.isArray(value)) {
value = angular.toJson(value); value = angular.toJson(value);
} }
webStorage.setItem(deriveQualifiedKey(key), value); if (webStorage) {webStorage.setItem(deriveQualifiedKey(key), value)};
if (notify.setItem) { if (notify.setItem) {
$rootScope.$broadcast('LocalStorageModule.notification.setitem', {key: key, newvalue: value, storageType: this.storageType}); $rootScope.$broadcast('LocalStorageModule.notification.setitem', {key: key, newvalue: value, storageType: this.storageType});
} }
@ -151,7 +154,7 @@ angularLocalStorage.provider('localStorageService', function() {
return getFromCookies(key); return getFromCookies(key);
} }
var item = webStorage.getItem(deriveQualifiedKey(key)); var item = webStorage ? webStorage.getItem(deriveQualifiedKey(key)) : null;
// angular.toJson will convert null to 'null', so a proper conversion is needed // angular.toJson will convert null to 'null', so a proper conversion is needed
// FIXME not a perfect solution, since a valid 'null' string can't be stored // FIXME not a perfect solution, since a valid 'null' string can't be stored
if (!item || item === 'null') { if (!item || item === 'null') {