Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts.

Browse Source
This commit is contained in:
Edward Lee 2010-07-21 00:35:09 -07:00
parent 025fe8aa96
commit 6e3eb1b573
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/browser.js
View File

@ -7757,16 +7757,12 @@ var TabContextMenu = {
updateContextMenu: function updateContextMenu(aPopupMenu) {
this.contextTab = document.popupNode.localName == "tab" ?
document.popupNode : gBrowser.selectedTab;
<<<<<<< local
var disabled = gBrowser.visibleTabs.length == 1;
=======
var disabled = gBrowser.tabs.length == 1;
// Enable the "Close Tab" menuitem when the window doesn't close with the last tab.
document.getElementById("context_closeTab").disabled =
disabled && gBrowser.tabContainer._closeWindowWithLastTab;
>>>>>>> other
var menuItems = aPopupMenu.getElementsByAttribute("tbattr", "tabbrowser-multiple");
for (var i = 0; i < menuItems.length; i++)
menuItems[i].disabled = disabled;

10
browser/themes/winstripe/browser/jar.mn
View File

@ -175,18 +175,12 @@ browser.jar:
skin/classic/aero/browser/tabbrowser/progress.png (tabbrowser/progress.png)
skin/classic/aero/browser/tabbrowser/progress-pulsing.png (tabbrowser/progress-pulsing.png)
skin/classic/aero/browser/tabbrowser/tab.png (tabbrowser/tab.png)
<<<<<<< local
skin/classic/aero/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left-aero.png)
skin/classic/aero/browser/tabbrowser/tab-arrow-right.png (tabbrowser/tab-arrow-right-aero.png)
skin/classic/aero/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator-aero.png)
skin/classic/aero/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png)
skin/classic/aero/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/aero/browser/tabcandy/edit-light.png (tabcandy/edit-light.png)
skin/classic/aero/browser/tabcandy/edit.png (tabcandy/edit.png)
skin/classic/aero/browser/tabcandy/new-tab.png (tabcandy/new-tab.png)
skin/classic/aero/browser/tabcandy/platform.css (tabcandy/platform.css)
skin/classic/aero/browser/tabcandy/stack-expander.png (tabcandy/stack-expander.png)
skin/classic/aero/browser/tabcandy/tabcandy.png (tabcandy/tabcandy.png)
=======
skin/classic/aero/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png)
skin/classic/aero/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
>>>>>>> other
#endif