gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-22 16:55:46 +01:00
Code Issues Projects Releases Wiki Activity

Replace expression closures (getters).

Browse Source 
Expression closures are to be axed. See https://bugzil.la/1083458.
This commit is contained in:
Doug Kearns
2015-05-27 04:42:30 +10:00
parent ce82387cdd
commit 6e8040286a
48 changed files with 808 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
common/modules/sanitizer.jsm
View File

@@ -31,10 +31,18 @@ update(Range.prototype, {
contains: function (date) date == null ||
(this.min == null || date >= this.min) && (this.max == null || date <= this.max),
get isEternity() this.max == null && this.min == null,
get isSession() this.max == null && this.min == sanitizer.sessionStart,
get isEternity() {
return this.max == null && this.min == null;
},
get isSession() {
return this.max == null && this.min == sanitizer.sessionStart;
},
get native() this.isEternity ? null : [this.min || 0, this.max == null ? Number.MAX_VALUE : this.max]
get native() {
return this.isEternity ? null
: [this.min || 0, this.max == null ? Number.MAX_VALUE
: this.max];
}
});
var Item = Class("SanitizeItem", {
@@ -49,10 +57,14 @@ var Item = Class("SanitizeItem", {
description: Messages.Localized(""),
get cpdPref() (this.builtin ? "" : Item.PREFIX) + Item.BRANCH + Sanitizer.argToPref(this.name),
get shutdownPref() (this.builtin ? "" : Item.PREFIX) + Item.SHUTDOWN_BRANCH + Sanitizer.argToPref(this.name),
get cpd() prefs.get(this.cpdPref),
get shutdown() prefs.get(this.shutdownPref),
get cpdPref() {
return (this.builtin ? "" : Item.PREFIX) + Item.BRANCH + Sanitizer.argToPref(this.name);
},
get shutdownPref() {
return (this.builtin ? "" : Item.PREFIX) + Item.SHUTDOWN_BRANCH + Sanitizer.argToPref(this.name);
},
get cpd() { return prefs.get(this.cpdPref); },
get shutdown() { return prefs.get(this.shutdownPref); },
shouldSanitize: function (shutdown) (!shutdown || this.builtin || this.persistent) &&
prefs.get(shutdown ? this.shutdownPref : this.pref)
@@ -317,10 +329,18 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
return thing.QueryInterface(Ci.nsILoadContext);
},
get ranAtShutdown() config.prefs.get("didSanitizeOnShutdown"),
set ranAtShutdown(val) config.prefs.set("didSanitizeOnShutdown", Boolean(val)),
get runAtShutdown() prefs.get("privacy.sanitize.sanitizeOnShutdown"),
set runAtShutdown(val) prefs.set("privacy.sanitize.sanitizeOnShutdown", Boolean(val)),
get ranAtShutdown() {
return config.prefs.get("didSanitizeOnShutdown");
},
set ranAtShutdown(val) {
config.prefs.set("didSanitizeOnShutdown", Boolean(val));
},
get runAtShutdown() {
return prefs.get("privacy.sanitize.sanitizeOnShutdown");
},
set runAtShutdown(val) {
prefs.set("privacy.sanitize.sanitizeOnShutdown", Boolean(val));
},
sanitize: function sanitize(items, range)
this.withSavedValues(["sanitizing"], function () {
@@ -607,7 +627,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
"The default list of private items to sanitize",
"stringlist", "all",
{
get values() values(sanitizer.itemMap).toArray(),
get values() { return values(sanitizer.itemMap).toArray(); },
completer: function completer(context, extra) {
if (context.filter[0] == "!")
@@ -630,7 +650,11 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
"stringlist", "",
{
initialValue: true,
get values() [i for (i of values(sanitizer.itemMap)) if (i.persistent || i.builtin)],
get values() {
return [i
for (i of values(sanitizer.itemMap))
if (i.persistent || i.builtin)];
},
getter: function () !sanitizer.runAtShutdown ? [] : [
item.name for (item of values(sanitizer.itemMap))
if (item.shouldSanitize(true))
@@ -671,7 +695,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
options.add(["cookies", "ck"],
"The default mode for newly added cookie permissions",
"stringlist", "session",
{ get values() Sanitizer.COMMANDS });
{ get values() { return Sanitizer.COMMANDS; }});
options.add(["cookieaccept", "ca"],
"When to accept cookies",