Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset b96483ca2c27 (bug 1364516) for failing mochitest browser/components/customizableui/test/browser_exit_background_customize_mode.js and eslint failure at SessionStore.jsm:3696:7 | 'win' is not defined. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2017-05-15 15:19:07 +02:00
parent 1b6021c0de
commit c06df98c46
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
browser/components/sessionstore/SessionStore.jsm
View File

@ -2618,7 +2618,9 @@ var SessionStoreInternal = {
/**
* Updates the label and icon for a <xul:tab> using the data from
* tabData.
* tabData. If the tab being updated happens to be the
* customization mode tab, this function will tell the window's
* CustomizeMode instance about it.
*
* @param tab
* The <xul:tab> to update.
@ -2627,10 +2629,6 @@ var SessionStoreInternal = {
* not supplied, the data will be retrieved from the cache.
*/
updateTabLabelAndIcon(tab, tabData = null) {
if (tab.hasAttribute("customizemode")) {
return;
}
let browser = tab.linkedBrowser;
let win = browser.ownerGlobal;
@ -2650,6 +2648,8 @@ var SessionStoreInternal = {
} else if (activePageData.url != "about:blank") {
win.gBrowser.setInitialTabTitle(tab, activePageData.url);
}
} else if (tab.hasAttribute("customizemode")) {
win.gCustomizeMode.setTab(tab);
}
// Restore the tab icon.
@ -3692,10 +3692,6 @@ var SessionStoreInternal = {
};
}
if (tab.hasAttribute("customizemode")) {
win.gCustomizeMode.setTab(tab);
}
// Update tab label and icon to show something
// while we wait for the messages to be processed.
this.updateTabLabelAndIcon(tab, tabData);