From d7efe3374b6fd526d7799ce04aa29cdcad1a9a93 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Sun, 23 Jan 2011 20:07:50 -0500 Subject: [PATCH] Fix error when closing last about:blank tab on FF36. Closes issue #299. --HG-- branch : key-processing --- common/content/buffer.js | 7 +------ pentadactyl/content/config.js | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/common/content/buffer.js b/common/content/buffer.js index 21008477..6a030a2b 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -425,12 +425,7 @@ var Buffer = Module("buffer", { /** * @property {string} The current top-level document's URL. */ - get URL() { - let str = String(content.location.href); - for (let [k, v] in Iterator(util.newURI(content.location.href))) - str[k] = v; - return str; - }, + get URL() update(content.location.href, util.newURI(content.location.href)), /** * @property {number} The buffer's height in pixels. diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js index bed5b294..3c98bca7 100644 --- a/pentadactyl/content/config.js +++ b/pentadactyl/content/config.js @@ -85,7 +85,7 @@ var Config = Module("config", ConfigBase, { if (this.tabbrowser.mTabs.length > 1) this.tabbrowser.removeTab(tab); else { - if (modules.buffer.URL != "about:blank" || window.getWebNavigation().sessionHistory.count > 0) { + if (modules.buffer.uri.spec !== "about:blank" || window.getWebNavigation().sessionHistory.count > 0) { dactyl.open("about:blank", dactyl.NEW_BACKGROUND_TAB); this.tabbrowser.removeTab(tab); }