gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-04-05 02:53:32 +02:00
Code Issues Projects Releases Wiki Activity

Death to E4X and stuff.

Browse Source
This commit is contained in:
Kris Maglione
2012-12-16 21:35:20 -08:00
parent 3e1911476b
commit d8515c1548
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/content/dactyl.js
View File

@@ -16,7 +16,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
init: function () { init: function () {
window.dactyl = this; window.dactyl = this;
// cheap attempt at compatibility // cheap attempt at compatibility
let prop = { get: deprecated("dactyl", function liberator() dactyl) }; let prop = { get: deprecated("dactyl", function liberator() dactyl),
configurable: true };
Object.defineProperty(window, "liberator", prop); Object.defineProperty(window, "liberator", prop);
Object.defineProperty(modules, "liberator", prop); Object.defineProperty(modules, "liberator", prop);
this.commands = {}; this.commands = {};
@@ -108,7 +109,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
signals: { signals: {
"io.source": function ioSource(context, file, modTime) { "io.source": function ioSource(context, file, modTime) {
if (context.INFO) if (contexts.getDocs(context))
help.flush("help/plugins.xml", modTime); help.flush("help/plugins.xml", modTime);
} }
}, },
@@ -1243,8 +1244,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
if (attr in elem[1]) if (attr in elem[1])
info[attr] = elem[1][attr]; info[attr] = elem[1][attr];
} }
body.push(["h2", { xmlns: "dactyl", tag: info.name + '-plugin' }, body.push(["h2", { xmlns: "dactyl", tag: info[1].name + '-plugin' },
String(info.summary)]); String(info[1].summary)]);
body.push(info); body.push(info);
} }
} }

4
common/modules/contexts.jsm
View File

@@ -486,7 +486,9 @@ var Contexts = Module("contexts", {
let info = "INFO" in context && Cu.evalInSandbox("this.INFO instanceof XML ? INFO.toXMLString() : this.INFO", context); let info = "INFO" in context && Cu.evalInSandbox("this.INFO instanceof XML ? INFO.toXMLString() : this.INFO", context);
return /^</.test(info) ? XML(info) : info; return /^</.test(info) ? XML(info) : info;
} }
if (typeof context.INFO == "xml" || DOM.isJSONXML(context.INFO)) if (DOM.isJSONXML(context.INFO))
return context.INFO;
if (typeof context.INFO == "xml" && config.haveGecko(null, "14.*"))
return context.INFO; return context.INFO;
} }
catch (e) {} catch (e) {}