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

Localizify sanitizer descriptions.

Browse Source
This commit is contained in:
Kris Maglione
2011-03-07 19:18:09 -05:00
parent 274091eb79
commit cd4c0a7722
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/modules/base.jsm
View File

@@ -207,8 +207,8 @@ defineModule("base", {
"Struct", "StructBase", "Timer", "UTF8", "XPCOM", "XPCOMUtils", "XPCSafeJSObjectWrapper", "Struct", "StructBase", "Timer", "UTF8", "XPCOM", "XPCOMUtils", "XPCSafeJSObjectWrapper",
"array", "bind", "call", "callable", "ctypes", "curry", "debuggerProperties", "defineModule", "array", "bind", "call", "callable", "ctypes", "curry", "debuggerProperties", "defineModule",
"deprecated", "endModule", "forEach", "isArray", "isGenerator", "isinstance", "isObject", "deprecated", "endModule", "forEach", "isArray", "isGenerator", "isinstance", "isObject",
"isString", "isSubclass", "iter", "iterAll", "keys", "memoize", "octal", "properties", "isString", "isSubclass", "iter", "iterAll", "iterOwnProperties","keys", "memoize", "octal",
"require", "set", "update", "values", "withCallerGlobal" "properties", "require", "set", "update", "values", "withCallerGlobal"
], ],
use: ["config", "services", "util"] use: ["config", "services", "util"]
}, this); }, this);
@@ -279,6 +279,11 @@ function properties(obj, prototypes, debugger_) {
} }
} }
function iterOwnProperties(obj) {
for (let prop in properties(obj))
yield [prop, Object.getOwnPropertyDescriptor(obj, prop)];
}
function deprecated(alternative, fn) { function deprecated(alternative, fn) {
if (isObject(fn)) if (isObject(fn))
return Class.Property(iter(fn).map(function ([k, v]) [k, callable(v) ? deprecated(alternative, v) : v]) return Class.Property(iter(fn).map(function ([k, v]) [k, callable(v) ? deprecated(alternative, v) : v])

2
common/modules/overlay.jsm
View File

@@ -9,7 +9,7 @@ try {
Components.utils.import("resource://dactyl/bootstrap.jsm"); Components.utils.import("resource://dactyl/bootstrap.jsm");
defineModule("overlay", { defineModule("overlay", {
exports: ["ModuleBase"], exports: ["ModuleBase"],
require: ["config", "sanitizer", "services", "util"] require: ["config", "services", "util"]
}, this); }, this);
/** /**

20
common/modules/sanitizer.jsm
View File

@@ -17,8 +17,7 @@ try {
Components.utils.import("resource://dactyl/bootstrap.jsm"); Components.utils.import("resource://dactyl/bootstrap.jsm");
defineModule("sanitizer", { defineModule("sanitizer", {
exports: ["Range", "Sanitizer", "sanitizer"], exports: ["Range", "Sanitizer", "sanitizer"],
require: ["prefs", "services", "storage", "template", "util"], require: ["messages", "prefs", "services", "storage", "template", "util"],
use: ["messages"]
}, this); }, this);
let tmp = {}; let tmp = {};
@@ -36,15 +35,18 @@ update(Range.prototype, {
get native() this.isEternity ? null : [range.min || 0, range.max == null ? Number.MAX_VALUE : range.max] get native() this.isEternity ? null : [range.min || 0, range.max == null ? Number.MAX_VALUE : range.max]
}); });
var Item = Class("Item", { var Item = Class("SanitizeItem", {
init: function (name) { init: function (name, params) {
this.name = name; this.name = name;
this.description = params.description;
}, },
// Hack for completion: // Hack for completion:
"0": Class.Property({ get: function () this.name }), "0": Class.Property({ get: function () this.name }),
"1": Class.Property({ get: function () this.description }), "1": Class.Property({ get: function () this.description }),
description: Messages.Localized(""),
get cpdPref() (this.builtin ? "" : Item.PREFIX) + Item.BRANCH + Sanitizer.argToPref(this.name), 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 shutdownPref() (this.builtin ? "" : Item.PREFIX) + Item.SHUTDOWN_BRANCH + Sanitizer.argToPref(this.name),
get cpd() prefs.get(this.cpdPref), get cpd() prefs.get(this.cpdPref),
@@ -231,10 +233,12 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
}, },
addItem: function addItem(name, params) { addItem: function addItem(name, params) {
this.itemMap[name] = update(this.itemMap[name] || Item(name), let item = this.itemMap[name] || Item(name, params);
iter.toObject([k, v] this.itemMap[name] = item;
for ([k, v] in Iterator(params))
if (!callable(v)))); for (let [k, prop] in iterOwnProperties(params))
if (!("value" in prop) || !callable(prop.value) && !(k in item))
Object.defineProperty(item, k, prop);
let names = set([name].concat(params.contains || []).map(function (e) "clear-" + e)); let names = set([name].concat(params.contains || []).map(function (e) "clear-" + e));
if (params.action) if (params.action)