mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-02-05 04:35:46 +01:00
Fix slew of "Setting pref ... changed from its default value" messages on first startup.
This commit is contained in:
@@ -284,8 +284,9 @@ var ConfigBase = Class("ConfigBase", {
|
||||
TabClose;.tab-close-button
|
||||
TabIcon;.tab-icon min-width: 16px;
|
||||
TabText;.tab-text
|
||||
TabNumber font-weight: bold; margin: 0px; padding-right: .8ex;
|
||||
TabNumber font-weight: bold; margin: 0px; padding-right: .8ex; cursor: default;
|
||||
TabIconNumber {
|
||||
cursor: default;
|
||||
width: 16px;
|
||||
margin: 0 2px 0 -18px !important;
|
||||
font-weight: bold;
|
||||
|
||||
@@ -132,7 +132,7 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
|
||||
let defval = this._load(name, null, true);
|
||||
let saved = this._load(this.SAVED + name);
|
||||
|
||||
if (saved == null && curval != defval || curval != saved) {
|
||||
if (saved == null && curval != defval || saved != null && curval != saved) {
|
||||
let msg = "Warning: setting preference " + name + ", but it's changed from its default value.";
|
||||
if (message)
|
||||
msg = template.linkifyHelp(msg + " " + message);
|
||||
|
||||
@@ -115,10 +115,11 @@ var ObjectStore = Class("ObjectStore", StoreBase, {
|
||||
this.fireEvent("clear");
|
||||
},
|
||||
|
||||
get: function get(key, default_)
|
||||
key in this._object ? this._object[key] :
|
||||
arguments.length > 1 ? this.set(key, default_) :
|
||||
undefined,
|
||||
get: function get(key, default_) {
|
||||
return key in this._object ? this._object[key] :
|
||||
arguments.length > 1 ? this.set(key, default_) :
|
||||
undefined;
|
||||
},
|
||||
|
||||
keys: function keys() Object.keys(this._object),
|
||||
|
||||
|
||||
Reference in New Issue
Block a user