Correctly feature detect localStorage (fixes #1632)

2015-04-13 06:50:07 +09:00
parent 270649535e
commit a027a60f5d
2 changed files with 18 additions and 3 deletions
--- a/gui/scripts/syncthing/core/services/localeService.js
+++ b/gui/scripts/syncthing/core/services/localeService.js
@@ -32,8 +32,23 @@ angular.module('syncthing.core')
            }

            function autoConfigLocale() {
+                // Feature detect localStorage; https://mathiasbynens.be/notes/localstorage-pattern
+                var storage;
+                var fail;
+                var uid;
+                try {
+                    uid = new Date;
+                    (storage = window.localStorage).setItem(uid, uid);
+                    fail = storage.getItem(uid) != uid;
+                    storage.removeItem(uid);
+                    fail && (storage = false);
+                } catch (exception) {}
+
                var params = $location.search();
-                var savedLang = typeof(localStorage) != 'undefined' && localStorage[_SYNLANG];
+                var savedLang;
+                if (storage) {
+                    savedLang = storage[_SYNLANG];
+                }

                if(params.lang) {
                    useLocale(params.lang, true);