1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-04 19:15:46 +01:00

Fix some stupid bugs in newer JägerMonkey. Closes issue #86.

This commit is contained in:
Kris Maglione
2010-10-14 13:58:18 -04:00
parent fbb70c7093
commit e925a7db01
4 changed files with 9 additions and 7 deletions

View File

@@ -298,7 +298,7 @@ const Dactyl = Module("dactyl", {
if (!context)
context = userContext;
context[EVAL_STRING] = str;
return Cu.evalInSandbox("with (window) { eval(" + EVAL_STRING + ") }", context, "1.8", fileName, lineNumber);
return Cu.evalInSandbox("eval('with (window) {'+" + EVAL_STRING + "+'}')", context, "1.8", fileName, lineNumber);
},
/**

View File

@@ -160,7 +160,7 @@ const IO = Module("io", {
getRuntimeDirectories: function (name) {
let dirs = options["runtimepath"];
dirs = dirs.map(function (dir) File.joinPaths(dir, name, this.cwd))
dirs = dirs.map(function (dir) File.joinPaths(dir, name, this.cwd), this)
.filter(function (dir) dir.exists() && dir.isDirectory() && dir.isReadable());
return dirs;
},

View File

@@ -147,11 +147,13 @@ const Highlights = Module("Highlight", {
*
* @param {string} class
*/
selector: function (class_)
class_.replace(/(^|\s)([A-Z]\w+)\b/g,
selector: function (class_) {
const self = this;
return class_.replace(/(^|\s)([A-Z]\w+)\b/g,
function (m, n1, hl) n1 +
(this.highlight[hl] && this.highlight[hl].class != class_
? this.highlight[hl] : "[dactyl|highlight~=" + hl + "]")),
(self.highlight[hl] && self.highlight[hl].class != class_
? self.highlight[hl] : "[dactyl|highlight~=" + hl + "]"));
},
/**
* Clears all highlighting rules. Rules with default values are

View File

@@ -282,7 +282,7 @@ const File = Class("File", {
return null;
}
}
let self = XPCSafeJSObjectWrapper(file);
let self = XPCNativeWrapper(file);
self.__proto__ = File.prototype;
return self;
},