mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 936562 - Open new tabs to the right of the parent tab [r=sfoster]

This commit is contained in:
Matt Brubeck 2013-11-08 15:39:14 -08:00
Родитель 4e64836e63
Коммит 1d6ab9226c
5 изменённых файлов: 42 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
browser/metro/base/content/ContextCommands.js
Просмотреть файл

@ -170,8 +170,9 @@ var ContextCommands = {
// Link specific // Link specific
openLinkInNewTab: function cc_openLinkInNewTab() { openLinkInNewTab: function cc_openLinkInNewTab() {
Browser.addTab(ContextMenuUI.popupState.linkURL, false, Browser.selectedTab); let tab = Browser.addTab(ContextMenuUI.popupState.linkURL, false, Browser.selectedTab);
ContextUI.peekTabs(kOpenInNewTabAnimationDelayMsec); ContextUI.peekTabs(kOpenInNewTabAnimationDelayMsec);
Elements.tabList.strip.ensureElementIsVisible(tab.chromeTab);
}, },
copyLink: function cc_copyLink() { copyLink: function cc_copyLink() {

1
browser/metro/base/content/ContextUI.js
Просмотреть файл

@ -22,7 +22,6 @@ var ContextUI = {
Elements.browsers.addEventListener('URLChanged', this, true); Elements.browsers.addEventListener('URLChanged', this, true);
Elements.browsers.addEventListener("AlertActive", this, true); Elements.browsers.addEventListener("AlertActive", this, true);
Elements.browsers.addEventListener("AlertClose", this, true); Elements.browsers.addEventListener("AlertClose", this, true);
Elements.tabList.addEventListener('TabSelect', this, true);
Elements.panelUI.addEventListener('ToolPanelShown', this, false); Elements.panelUI.addEventListener('ToolPanelShown', this, false);
Elements.panelUI.addEventListener('ToolPanelHidden', this, false); Elements.panelUI.addEventListener('ToolPanelHidden', this, false);

8
browser/metro/base/content/bindings/tabs.xml
Просмотреть файл

@ -159,10 +159,16 @@
</property> </property>
<method name="addTab"> <method name="addTab">
<parameter name="aIndex"/>
<body> <body>
<![CDATA[ <![CDATA[
let tab = document.createElement("documenttab"); let tab = document.createElement("documenttab");
this.strip.appendChild(tab); if (aIndex >= 0) {
let child = this.strip.children[aIndex];
this.strip.insertBefore(tab, child);
} else {
this.strip.appendChild(tab);
}
return tab; return tab;
]]> ]]>
</body> </body>

1
browser/metro/base/content/browser-ui.js
Просмотреть файл

@ -433,6 +433,7 @@ var BrowserUI = {
/** /**
* Open a new tab in the foreground in response to a user action. * Open a new tab in the foreground in response to a user action.
* See Browser.addTab for more documentation.
*/ */
addAndShowTab: function (aURI, aOwner) { addAndShowTab: function (aURI, aOwner) {
ContextUI.peekTabs(kNewTabAnimationDelayMsec); ContextUI.peekTabs(kNewTabAnimationDelayMsec);

34
browser/metro/base/content/browser.js
Просмотреть файл

@ -446,10 +446,40 @@ var Browser = {
return this._tabId++; return this._tabId++;
}, },
/**
* Create a new tab and add it to the tab list.
*
* If you are opening a new foreground tab in response to a user action, use
* BrowserUI.addAndShowTab which will also show the tab strip.
*
* @param aURI String specifying the URL to load.
* @param aBringFront Boolean (optional) Open the new tab in the foreground?
* @param aOwner Tab object (optional) The "parent" of the new tab.
* This is the tab responsible for opening the new tab. When the new tab
* is closed, we will return to a parent or "sibling" tab if possible.
* @param aParams Object (optional) with optional properties:
* index: Number specifying where in the tab list to insert the new tab.
* flags, postData, charset, referrerURI: See loadURIWithFlags.
*/
addTab: function browser_addTab(aURI, aBringFront, aOwner, aParams) { addTab: function browser_addTab(aURI, aBringFront, aOwner, aParams) {
let params = aParams || {}; let params = aParams || {};
if (aOwner && !('index' in params)) {
// Position the new tab to the right of its owner...
params.index = this._tabs.indexOf(aOwner) + 1;
// ...and to the right of any siblings.
while (this._tabs[params.index] && this._tabs[params.index].owner == aOwner) {
params.index++;
}
}
let newTab = new Tab(aURI, params, aOwner); let newTab = new Tab(aURI, params, aOwner);
this._tabs.push(newTab);
if (params.index >= 0) {
this._tabs.splice(params.index, 0, newTab);
} else {
this._tabs.push(newTab);
}
if (aBringFront) if (aBringFront)
this.selectedTab = newTab; this.selectedTab = newTab;
@ -1299,7 +1329,7 @@ Tab.prototype = {
create: function create(aURI, aParams, aOwner) { create: function create(aURI, aParams, aOwner) {
this._eventDeferred = Promise.defer(); this._eventDeferred = Promise.defer();
this._chromeTab = Elements.tabList.addTab(); this._chromeTab = Elements.tabList.addTab(aParams.index);
this._id = Browser.createTabId(); this._id = Browser.createTabId();
let browser = this._createBrowser(aURI, null); let browser = this._createBrowser(aURI, null);