diff --git a/manage.js b/manage.js index 8551e408..3b780bef 100644 --- a/manage.js +++ b/manage.js @@ -15,7 +15,7 @@ function showStyles(styles) { styles.map(createStyleElement).forEach(function(e) { installed.appendChild(e); }); - loadPrefs({"show-badge": "true"}); + loadPrefs({"show-badge": true}); } function createStyleElement(style) { diff --git a/popup.js b/popup.js index 136f3588..3f07bb54 100644 --- a/popup.js +++ b/popup.js @@ -27,7 +27,7 @@ chrome.tabs.getSelected(null, function(tab) { var urlLink = writeStyleTemplate.cloneNode(true); urlLink.href = "edit.html?url-prefix=" + encodeURIComponent(tab.url); urlLink.appendChild(document.createTextNode( // switchable; default="this URL" - prefs.getPref("popup.breadcrumbs.usePath") + !prefs.getPref("popup.breadcrumbs.usePath") ? t("writeStyleForURL").replace(/ /g, "\u00a0") : /\/\/[^/]+\/(.*)/.exec(tab.url)[1] )); diff --git a/storage.js b/storage.js index b18a6107..ccbd2a1e 100644 --- a/storage.js +++ b/storage.js @@ -144,7 +144,7 @@ function changePref(event) { // Accepts a hash of pref name to default value function loadPrefs(prefs) { for (var id in prefs) { - var value = this.prefs.getPref(id); + var value = this.prefs.getPref(id, prefs[id]); var el = document.getElementById(id); if (isCheckbox(el)) { el.checked = value; @@ -165,13 +165,7 @@ var prefs = { "popup.breadcrumbs": true, // display "New style" links as URL breadcrumbs "popup.breadcrumbs.usePath": false, // use URL path for "this URL" - "popup.enabledFirst": true, // display enabled styles before disabled styles - "manage.enabledFirst": true, // display enabled styles before disabled styles - - "observer.observeFrameContent": false, // [hh] add MutationObserver inside IFRAMEs - "observer.observeFrameLoad": false, // [hh] add onLoad listener to IFRAMEs - // https://github.com/JasonBarnabe/stylish-chrome/pull/39#issuecomment-76681235 NO_DEFAULT_PREFERENCE: "No default preference for '%s'", UNHANDLED_DATA_TYPE: "Default '%s' is of type '%s' - what should be done with it?", @@ -198,7 +192,7 @@ var prefs = { setPref: function(key, value) { if (!(key in this)) console.warn(this.NO_DEFAULT_PREFERENCE, key); if (value === undefined) localStorage.removeItem(key); - else localStorage.setItem(key, JSON.stringify(value)); + else localStorage.setItem(key, "string" === typeof value ? value : JSON.stringify(value)); notifyAllTabs({method: "prefChanged", prefName: key, value: value}); },