gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-04 16:55:51 +01:00
Code Issues Projects Releases Wiki Activity

Fix NS_ERROR_NOT_INITIALIZED on some :write filename completions.

Browse Source
This commit is contained in:
Kris Maglione
2015-05-18 14:22:34 -07:00
parent 07ce319763
commit 72a4d80ad1
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/modules/base.jsm
View File

@@ -46,6 +46,18 @@ jsmodules.jsmodules = jsmodules;
function toString() "[module-global " + this.NAME + "]"; function toString() "[module-global " + this.NAME + "]";
function objToString(obj) {
try {
return objproto.toString.call(obj);
}
catch (e) {
var type_ = typeof obj;
if (e == null)
type_ = String(e);
return "[non-object " + type_ + "]";
}
}
let use = {}; let use = {};
let loaded = {}; let loaded = {};
let currentModule; let currentModule;
@@ -635,7 +647,7 @@ function isinstance(object, interfaces) {
return Array.concat(interfaces).some(function isinstance_some(iface) { return Array.concat(interfaces).some(function isinstance_some(iface) {
if (typeof iface === "string") { if (typeof iface === "string") {
if (objproto.toString.call(object) === "[object " + iface + "]") if (objToString(object) === "[object " + iface + "]")
return true; return true;
} }
else if (typeof object === "object" && "isinstance" in object && object.isinstance !== isinstance) { else if (typeof object === "object" && "isinstance" in object && object.isinstance !== isinstance) {
@@ -674,7 +686,7 @@ var isArray =
* functions containing the 'yield' statement and generator * functions containing the 'yield' statement and generator
* statements such as (x for (x in obj)). * statements such as (x for (x in obj)).
*/ */
function isGenerator(val) objproto.toString.call(val) == "[object Generator]"; function isGenerator(val) objToString(val) == "[object Generator]";
/** /**
* Returns true if and only if its sole argument is a String, * Returns true if and only if its sole argument is a String,
@@ -683,7 +695,7 @@ function isGenerator(val) objproto.toString.call(val) == "[object Generator]";
* namespace, or execution context, which is not the case when * namespace, or execution context, which is not the case when
* using (obj instanceof String) or (typeof obj == "string"). * using (obj instanceof String) or (typeof obj == "string").
*/ */
function isString(val) objproto.toString.call(val) == "[object String]"; function isString(val) objToString(val) == "[object String]";
/** /**
* Returns true if and only if its sole argument may be called * Returns true if and only if its sole argument may be called

7
common/modules/buffer.jsm
View File

@@ -1517,7 +1517,12 @@ var Buffer = Module("Buffer", {
if (type === "text/plain") if (type === "text/plain")
ext = "." + (currExt || "txt"); ext = "." + (currExt || "txt");
else else
ext = "." + services.mime.getPrimaryExtension(type, currExt); try {
ext = "." + services.mime.getPrimaryExtension(type, currExt);
}
catch (e) {
ext = currExt ? "." + curExt : "";
}
} }
else if (currExt) else if (currExt)
ext = "." + currExt; ext = "." + currExt;