Merge mozilla-central to tabcandy-central.
This commit is contained in:
@@ -166,6 +166,7 @@ let gInitialPages = [
|
||||
#include inspector.js
|
||||
#include browser-places.js
|
||||
#include browser-tabPreviews.js
|
||||
#include browser-tabcandy.js
|
||||
|
||||
XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
|
||||
#ifdef XP_WIN
|
||||
@@ -6728,11 +6729,13 @@ var gBookmarkAllTabsHandler = {
|
||||
this._command = document.getElementById("Browser:BookmarkAllTabs");
|
||||
gBrowser.tabContainer.addEventListener("TabOpen", this, true);
|
||||
gBrowser.tabContainer.addEventListener("TabClose", this, true);
|
||||
gBrowser.tabContainer.addEventListener("TabSelect", this, true);
|
||||
gBrowser.tabContainer.addEventListener("TabMove", this, true);
|
||||
this._updateCommandState();
|
||||
},
|
||||
|
||||
_updateCommandState: function BATH__updateCommandState(aTabClose) {
|
||||
var numTabs = gBrowser.tabs.length;
|
||||
var numTabs = gBrowser.visibleTabs.length;
|
||||
|
||||
// The TabClose event is fired before the tab is removed from the DOM
|
||||
if (aTabClose)
|
||||
@@ -7755,7 +7758,7 @@ var TabContextMenu = {
|
||||
updateContextMenu: function updateContextMenu(aPopupMenu) {
|
||||
this.contextTab = document.popupNode.localName == "tab" ?
|
||||
document.popupNode : gBrowser.selectedTab;
|
||||
var disabled = gBrowser.tabs.length == 1;
|
||||
var disabled = gBrowser.visibleTabs.length == 1;
|
||||
|
||||
// Enable the "Close Tab" menuitem when the window doesn't close with the last tab.
|
||||
document.getElementById("context_closeTab").disabled =
|
||||
|
||||
Reference in New Issue
Block a user