Bug 578614 - tab context menu should not appear when right-clicking new tab button or the space to its right. r=dao

2010-07-17 10:08:43 +02:00 · 2010-07-17 10:08:43 +02:00 · 11841ef388
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@ -859,7 +859,6 @@

      <tabs id="tabbrowser-tabs"
            class="tabbrowser-tabs"
-            context="tabContextMenu"
            tabbrowser="content"
            flex="1"
            setfocus="false"
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@ -2404,7 +2404,7 @@
      </field>

      <field name="contextMenu" readonly="true">
-        document.getElementById(this.getAttribute("context"));
+        document.getElementById("tabContextMenu");
      </field>

      <field name="mTabstripWidth">0</field>
@ -2563,7 +2563,7 @@
      <field name="_animateElement">
        this.mTabstrip._scrollButtonDown;
      </field>
-      
+
      <method name="_notifyBackgroundTab">
        <parameter name="aTab"/>
        <body><![CDATA[
@ -2786,7 +2786,7 @@
        // otherwise trying to deatch the tab by dropping it on the desktop
        // may result in an "internet shortcut"
        dt.mozSetDataAt("text/x-moz-text-internal", spec, 0);
-        
+
        // Set the cursor to an arrow during tab drags.
        dt.mozCursor = "default";

@ -3091,7 +3091,7 @@
      <stylesheet src="chrome://browser/content/tabbrowser.css"/>
    </resources>

-    <content closetabtext="&closeTab.label;">
+    <content context="tabContextMenu" closetabtext="&closeTab.label;">
      <xul:image xbl:inherits="validate,src=image"
                 class="tab-icon-image"
                 role="presentation"/>