Merge pull request #96 from caisui/fix/issue_81

fix: __iterator__ set on Xray's XPathResult object not being called (3rd...

Author: maxauthority

common/content/util.js

@@ -408,9 +408,15 @@ const Util = Module("util", {
 
         if (services.get("vc").compare(Application.version, "33") >= 0
             && Cu.isXrayWrapper(result)) {
-            let (xr = result, s = asIterator ? "iterateNext" : "snapshotItem") {
-                result = Object.create(xr);
-                result[s] = xr[s].bind(xr);
+            let xr = result;
+
+            if (asIterator) {
+                result = { iterateNext: function iterateNext() xr.iterateNext()};
+            } else {
+                result = {
+                    snapshotItem: function snapshotItem(num) xr.snapshotItem(num),
+                    get snapshotLength() xr.snapshotLength,
+                };
             }
         }