Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forkqueue #1

Merged
merged 5 commits into from Aug 27, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion install.rdf
Expand Up @@ -22,7 +22,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
<em:minVersion>4.0b1</em:minVersion>
<em:maxVersion>4.0.*</em:maxVersion>
<em:maxVersion>6.0.*</em:maxVersion>
</Description>
</em:targetApplication>
<!-- SeaMonkey -->
Expand Down
17 changes: 15 additions & 2 deletions modules/prototypes.js
Expand Up @@ -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];
}
}
Expand Down Expand Up @@ -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();
},
Expand Down Expand Up @@ -658,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
Expand Down