open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use typed preference methods correctly

Browse Source 
(1) `loadPrefs` was called with string instead of boolean
(2) Sense of boolean `popup.breadcrumbs.usePath` was inverted
(3) `loadPrefs` wasn't passing default to `getPrefs`
(4) `JSON.stringify(string)` added quotes to string
(5) Preferences `manage.enabledFirst`, `observer.observeFrameContent`, `observer.observeFrameLoad` aren't used
This commit is contained in:
hideheader 2015-03-07 01:51:07 -05:00
parent eb9cc20d58
commit 6ec65ab9e9
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manage.js
View File

@ -15,7 +15,7 @@ function showStyles(styles) {
styles.map(createStyleElement).forEach(function(e) { styles.map(createStyleElement).forEach(function(e) {
installed.appendChild(e); installed.appendChild(e);
}); });
loadPrefs({"show-badge": "true"}); loadPrefs({"show-badge": true});
} }
function createStyleElement(style) { function createStyleElement(style) {

2
popup.js
View File

@ -27,7 +27,7 @@ chrome.tabs.getSelected(null, function(tab) {
var urlLink = writeStyleTemplate.cloneNode(true); var urlLink = writeStyleTemplate.cloneNode(true);
urlLink.href = "edit.html?url-prefix=" + encodeURIComponent(tab.url); urlLink.href = "edit.html?url-prefix=" + encodeURIComponent(tab.url);
urlLink.appendChild(document.createTextNode( // switchable; default="this URL" urlLink.appendChild(document.createTextNode( // switchable; default="this URL"
prefs.getPref("popup.breadcrumbs.usePath") !prefs.getPref("popup.breadcrumbs.usePath")
? t("writeStyleForURL").replace(/ /g, "\u00a0") ? t("writeStyleForURL").replace(/ /g, "\u00a0")
: /\/\/[^/]+\/(.*)/.exec(tab.url)[1] : /\/\/[^/]+\/(.*)/.exec(tab.url)[1]
)); ));

10
storage.js
View File

@ -144,7 +144,7 @@ function changePref(event) {
// Accepts a hash of pref name to default value // Accepts a hash of pref name to default value
function loadPrefs(prefs) { function loadPrefs(prefs) {
for (var id in 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); var el = document.getElementById(id);
if (isCheckbox(el)) { if (isCheckbox(el)) {
el.checked = value; el.checked = value;
@ -165,13 +165,7 @@ var prefs = {
"popup.breadcrumbs": true, // display "New style" links as URL breadcrumbs "popup.breadcrumbs": true, // display "New style" links as URL breadcrumbs
"popup.breadcrumbs.usePath": false, // use URL path for "this URL" "popup.breadcrumbs.usePath": false, // use URL path for "this URL"
"popup.enabledFirst": true, // display enabled styles before disabled styles "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'", NO_DEFAULT_PREFERENCE: "No default preference for '%s'",
UNHANDLED_DATA_TYPE: "Default '%s' is of type '%s' - what should be done with it?", 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) { setPref: function(key, value) {
if (!(key in this)) console.warn(this.NO_DEFAULT_PREFERENCE, key); if (!(key in this)) console.warn(this.NO_DEFAULT_PREFERENCE, key);
if (value === undefined) localStorage.removeItem(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}); notifyAllTabs({method: "prefChanged", prefName: key, value: value});
}, },