Fennec: fix tab title

This commit is contained in:
Deathamns 2015-03-01 21:38:51 +01:00
parent da3586adde
commit 9dbb00819f
1 changed files with 10 additions and 5 deletions

View File

@ -579,7 +579,7 @@ vAPI.tabs.get = function(tabId, callback) {
} }
} }
// for internal use // For internal use
if ( typeof callback !== 'function' ) { if ( typeof callback !== 'function' ) {
return tab; return tab;
} }
@ -595,9 +595,14 @@ vAPI.tabs.get = function(tabId, callback) {
var browser = getBrowserForTab(tab); var browser = getBrowserForTab(tab);
var tabBrowser = getTabBrowser(win); var tabBrowser = getTabBrowser(win);
var tabIndex = vAPI.fennec var tabIndex, tabTitle;
? tabBrowser.tabs.indexOf(tab) if ( vAPI.fennec ) {
: tabBrowser.browsers.indexOf(browser); tabIndex = tabBrowser.tabs.indexOf(tab);
tabTitle = browser.contentTitle;
} else {
tabIndex = tabBrowser.browsers.indexOf(browser);
tabTitle = tab.label;
}
callback({ callback({
id: tabId, id: tabId,
@ -605,7 +610,7 @@ vAPI.tabs.get = function(tabId, callback) {
windowId: windows.indexOf(win), windowId: windows.indexOf(win),
active: tab === tabBrowser.selectedTab, active: tab === tabBrowser.selectedTab,
url: browser.currentURI.asciiSpec, url: browser.currentURI.asciiSpec,
title: tab.label title: tabTitle
}); });
}; };