diff --git a/common/modules/base.jsm b/common/modules/base.jsm index 874d2cbf..f5f66165 100644 --- a/common/modules/base.jsm +++ b/common/modules/base.jsm @@ -1053,14 +1053,14 @@ function iter(obj) { let args = arguments; let res = Iterator(obj); - if (isinstance(args, ["Iterator", "Generator"])) - ; - else if (args.length > 1) + if (args.length > 1) res = (function () { for (let i = 0; i < args.length; i++) - for (let j in Iterator(args[i])) + for (let j in iter(args[i])) yield j; })(); + else if (isinstance(obj, ["Iterator", "Generator"])) + ; else if (ctypes && ctypes.CData && obj instanceof ctypes.CData) { while (obj.constructor instanceof ctypes.PointerType) obj = obj.contents; diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js index b3abe375..131cebca 100644 --- a/pentadactyl/content/config.js +++ b/pentadactyl/content/config.js @@ -311,7 +311,7 @@ var Config = Module("config", ConfigBase, { completion.sidebar = function sidebar(context) { let menu = document.getElementById("viewSidebarMenu"); context.title = ["Sidebar Panel"]; - context.completions = Array.map(menu.childNodes, function (n) [n.label, ""]); + context.completions = Array.map(menu.childNodes, function (n) [n.getAttribute("label"), ""]); }; completion.addUrlCompleter("l",