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

Recognize new-style iterators in util.objectToString.

Browse Source
This commit is contained in:
Kris Maglione
2014-02-22 14:26:52 -08:00
parent c59f873634
commit 414a165e9c
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/modules/util.jsm
View File

@@ -1033,12 +1033,18 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
// window.content often does not want to be queried with "var i in object"
try {
let hasValue = !("__iterator__" in object || isinstance(object, ["Generator", "Iterator"]));
if (object.dactyl && object.modules && object.modules.modules == object.modules) {
object = Iterator(object);
hasValue = false;
}
let keyIter = object;
if ("__iterator__" in object && !callable(object.__iterator__))
if (iter.iteratorProp in object) {
keyIter = (k for (k of object));
hasValue = false;
}
else if ("__iterator__" in object && !callable(object.__iterator__))
keyIter = keys(object);
for (let i in keyIter) {
@@ -1047,6 +1053,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
value = object[i];
}
catch (e) {}
if (!hasValue) {
if (isArray(i) && i.length == 2)
[i, value] = i;