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

Merge default.

Browse Source 
--HG--
branch : groups
This commit is contained in:
Kris Maglione
2011-02-08 22:43:42 -05:00
parent 863c10df7a f904799f9d
commit 8acf2c4ff0
7 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/modules/base.jsm
View File

@@ -676,7 +676,8 @@ function Class() {
return res !== undefined ? res : self;
})]]>,
"constructor", (name || superclass.className).replace(/\W/g, "_"))
.replace("PARAMS", /^function .*?\((.*?)\)/.exec(args[0] && args[0].init || Class.prototype.init)[1]));
.replace("PARAMS", /^function .*?\((.*?)\)/.exec(args[0] && args[0].init || Class.prototype.init)[1]
.replace(/\b(self|res|Constructor)\b/g, "$1_")));
Constructor.className = name || superclass.className || superclass.name;

6
common/modules/bootstrap.jsm
View File

@@ -14,9 +14,9 @@ var storage = Components.classes["@mozilla.org/fuel/application;1"]
var JSMLoader = storage.get("dactyl.JSMLoader", undefined);
if (!JSMLoader || JSMLoader.bump != 3)
if (!JSMLoader || JSMLoader.bump != 4)
JSMLoader = {
bump: 3,
bump: 4,
builtin: Components.utils.Sandbox(this),
canonical: {},
factories: [],
@@ -33,7 +33,7 @@ if (!JSMLoader || JSMLoader.bump != 3)
this.storage.set("dactyl.JSMLoader", this);
let base = JSMLoader.load("base.jsm", global);
let base = this.load("base.jsm", global);
global.EXPORTED_SYMBOLS = base.EXPORTED_SYMBOLS;
global.JSMLoader = this;
base.JSMLoader = this;

2
common/modules/config.jsm
View File

@@ -754,6 +754,6 @@ config.INIT = update(Object.create(config.INIT), config.INIT, {
endModule();
} catch(e){ if (isString(e)) e = Error(e); dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack); }
} catch(e){ if (typeof e === "string") e = Error(e); dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack); }
// vim: set fdm=marker sw=4 sts=4 et ft=javascript:

7
common/modules/sanitizer.jsm
View File

@@ -497,10 +497,13 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
case "list":
modules.commandline.commandOutput(template.tabular(
["Host", "Session", "Path", "Value"], ["padding-right: 1em", "padding-right: 1em", "padding-right: 1em"],
["Host", "Expiry (UTC)", "Path", "Name", "Value"],
["padding-right: 1em", "padding-right: 1em", "padding-right: 1em", "max-width: 12em; overflow: hidden;", "padding-left: 1ex;"],
([c.host,
<span highlight={c.isSession ? "Enabled" : "Disabled"}>{c.isSession ? "session" : "persistent"}</span>,
c.isSession ? <span highlight="Enabled">session</span>
: (new Date(c.expiry * 1000).toJSON() || "Never").replace(/:\d\d\.000Z/, "").replace("T", " ").replace(/-/g, "/"),
c.path,
c.name,
c.value]
for (c in Sanitizer.iterCookies(host)))));
return;