1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-19 22:27:58 +01:00

e10s fixes.

This commit is contained in:
Kris Maglione
2015-02-23 17:32:52 -08:00
parent 271c3a95c7
commit 8d3e8994f1
4 changed files with 7 additions and 6 deletions

5
common/bootstrap.js vendored
View File

@@ -263,6 +263,7 @@ function init() {
else { else {
bootstrap = Cu.Sandbox(Cc["@mozilla.org/systemprincipal;1"].createInstance(), bootstrap = Cu.Sandbox(Cc["@mozilla.org/systemprincipal;1"].createInstance(),
{ sandboxName: BOOTSTRAP, { sandboxName: BOOTSTRAP,
addonId: addon.id,
metadata: { addonID: addon.id } }); metadata: { addonID: addon.id } });
Services.scriptloader.loadSubScript(BOOTSTRAP, bootstrap); Services.scriptloader.loadSubScript(BOOTSTRAP, bootstrap);
} }
@@ -407,8 +408,8 @@ FactoryProxy.prototype = {
return this.module; return this.module;
}, },
createInstance: function (iids) { createInstance: function (iids) {
return let (factory = this.module.NSGetFactory(this.classID)) let factory = this.module.NSGetFactory(this.classID);
factory.createInstance.apply(factory, arguments); return factory.createInstance.apply(factory, arguments);
} }
} }

View File

@@ -256,7 +256,7 @@ var Buffer = Module("Buffer", {
/** /**
* @property {nsIURI} The current top-level document's URI. * @property {nsIURI} The current top-level document's URI.
*/ */
get uri() util.newURI(this.win.location.href), get uri() util.newURI(this.win.location.href),
/** /**
* @property {nsIURI} The current top-level document's URI, sans * @property {nsIURI} The current top-level document's URI, sans

View File

@@ -1406,9 +1406,9 @@ var Commands = Module("commands", {
// Fix me. // Fix me.
if (isString(sep)) if (isString(sep))
sep = RegExp(sep); sep = RegExp(sep || "(?:)");
sep = sep != null ? sep : /\s/; sep = sep != null ? sep : /\s/;
let re1 = RegExp("^" + (sep.source === "" ? "(?!)" : sep.source)); let re1 = RegExp("^" + (sep.source === "(?:)" ? "(?!)" : sep.source));
let re2 = RegExp(/^()((?:[^\\S"']|\\.)+)((?:\\$)?)/.source.replace("S", sep.source)); let re2 = RegExp(/^()((?:[^\\S"']|\\.)+)((?:\\$)?)/.source.replace("S", sep.source));
while (str.length && !re1.test(str)) { while (str.length && !re1.test(str)) {

View File

@@ -798,7 +798,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
if (params.user != null || params.pass != null) if (params.user != null || params.pass != null)
args.push(params.user); args.push(params.user);
if (params.pass != null) if (params.pass != null)
args.push(prams.pass); args.push(params.pass);
apply(xmlhttp, "open", args); apply(xmlhttp, "open", args);