diff --git a/common/content/buffer.js b/common/content/buffer.js index af099e74..34a528e6 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -311,7 +311,7 @@ var Buffer = Module("buffer", { allFrames: function allFrames(win, focusedFirst) { let frames = []; (function rec(frame) { - if (frame.document.body instanceof HTMLBodyElement) + if (true || frame.document.body instanceof HTMLBodyElement) frames.push(frame); Array.forEach(frame.frames, rec); })(win || content); diff --git a/common/content/dactyl.js b/common/content/dactyl.js index c1f15917..89039695 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -871,7 +871,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { value = "hl-" + value; } if (name == "href") { - value = node.href; + value = node.href || value; if (value.indexOf("dactyl://help-tag/") == 0) { let uri = services.io.newChannel(value, null, null).originalURI; value = uri.spec == value ? "javascript:;" : uri.path.substr(1); @@ -907,8 +907,10 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), { let chromeFiles = {}; let styles = {}; for (let [file, ] in Iterator(services["dactyl:"].FILE_MAP)) { - dactyl.open("dactyl://help/" + file); - dactyl.modules.events.waitForPageLoad(); + let url = "dactyl://help/" + file; + dactyl.open(url); + util.waitFor(function () content.location.href == url, 5000); + events.waitForPageLoad(); var data = [ '\n', '