From 44133fcd41ef04eaae1e1768dedc3a3170c08155 Mon Sep 17 00:00:00 2001 From: fhoech Date: Fri, 22 Jul 2011 19:08:10 +0800 Subject: [PATCH 1/5] FF 5.0 support (only tested under Windows; needs more testing, not tested with FF 4): Added passthrough setCurrentURI (see https://gist.github.com/943273) and replaced browser.webNavigation._pauseLoadURI with browser.webNavigation.loadURI --- modules/prototypes.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/prototypes.js b/modules/prototypes.js index 0e1c829..7ad84b7 100644 --- a/modules/prototypes.js +++ b/modules/prototypes.js @@ -542,6 +542,9 @@ BarTabWebNavigation.prototype = { /*** These methods and properties are simply passed through. ***/ + setCurrentURI: function (aURI) { + return this._original.setCurrentURI(aURI); + }, goBack: function () { return this._original.goBack(); }, @@ -686,7 +689,7 @@ BarTabWebProgressListener.prototype = { let flags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE; let window = this._tab.ownerDocument.defaultView; window.setTimeout(function () { - browser.webNavigation._pauseLoadURI( + browser.webNavigation.loadURI( uri.spec, flags, referrer, postData, null); }, 0); }, From 6617a209064be47bd897386f20eed506352da12f Mon Sep 17 00:00:00 2001 From: xabolcs Date: Sun, 28 Aug 2011 08:24:17 +0300 Subject: [PATCH 2/5] Not accepting foech's `_pauseLoadURI`->`loadURI` change for now --- modules/prototypes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/prototypes.js b/modules/prototypes.js index 7ad84b7..739d5db 100644 --- a/modules/prototypes.js +++ b/modules/prototypes.js @@ -689,7 +689,7 @@ BarTabWebProgressListener.prototype = { let flags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE; let window = this._tab.ownerDocument.defaultView; window.setTimeout(function () { - browser.webNavigation.loadURI( + browser.webNavigation._pauseLoadURI( uri.spec, flags, referrer, postData, null); }, 0); }, From 4323f589a9e51e4b9e9516a159985894302bacc9 Mon Sep 17 00:00:00 2001 From: xabolcs Date: Sun, 28 Aug 2011 08:36:43 +0300 Subject: [PATCH 3/5] improved BarTabWebProgressListener: panorama switch --- modules/prototypes.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/prototypes.js b/modules/prototypes.js index 739d5db..8d76a4d 100644 --- a/modules/prototypes.js +++ b/modules/prototypes.js @@ -661,6 +661,16 @@ BarTabWebProgressListener.prototype = { browser.webNavigation.unhook(); return; } + + // Panorama switch + if (this._tab._tabViewTabItem && + this._tab._tabViewTabItem.parent && + this._tab._tabViewTabItem.parent._activeTab.tab && + this._tab._tabViewTabItem.parent._activeTab.tab == this._tab + ) { + this._tab.removeAttribute("ontab"); + return; + } // If it's an HTTP request, we want to set the right referrer. // And if it's a POST request on top of that, we want to make From 3e2c884e5cacdd540556d5eaac5c2fd3c4c29a5a Mon Sep 17 00:00:00 2001 From: robsonsobral Date: Wed, 27 Jul 2011 22:34:27 +0800 Subject: [PATCH 4/5] Select the nearest tab just from the same tabe group. --- modules/prototypes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/prototypes.js b/modules/prototypes.js index 8d76a4d..a15726e 100644 --- a/modules/prototypes.js +++ b/modules/prototypes.js @@ -323,12 +323,12 @@ BarTabHandler.prototype = { while ((aTab._tPos - i >= 0) || (aTab._tPos + i < tabbrowser.mTabs.length)) { if (aTab._tPos + i < tabbrowser.mTabs.length) { - if (tabbrowser.mTabs[aTab._tPos+i].getAttribute("ontab") != "true") { + if (tabbrowser.mTabs[aTab._tPos+i].getAttribute("ontab") != "true" && tabbrowser.mTabs[aTab._tPos+i].getAttribute("linkedpanel") == aTab.selectedPanel) { return tabbrowser.mTabs[aTab._tPos+i]; } } if (aTab._tPos - i >= 0) { - if (tabbrowser.mTabs[aTab._tPos-i].getAttribute("ontab") != "true") { + if (tabbrowser.mTabs[aTab._tPos-i].getAttribute("ontab") != "true" && tabbrowser.mTabs[aTab._tPos-i].getAttribute("linkedpanel") == aTab.selectedPanel ) { return tabbrowser.mTabs[aTab._tPos-i]; } } From a89757e45aeae979b55119320025d8d1a044bf7c Mon Sep 17 00:00:00 2001 From: <> Date: Thu, 25 Aug 2011 01:32:52 +0800 Subject: [PATCH 5/5] Bump maxVersion to 6.0.* --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index 22f10cb..3c487ef 100644 --- a/install.rdf +++ b/install.rdf @@ -22,7 +22,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 4.0b1 - 4.0.* + 6.0.*