Bug 674847 - Make tooltip suppression during tab drag not fragile. r=dao
authorFrank Yan <fyan@mozilla.com>
Thu, 28 Jul 2011 21:26:37 -0700
changeset 73503 5bd0acd3230871f83f199c555ee050d854ea9f32
parent 73502 bc1a1ecbb82e620f31e3e7dedd3b1d78bf951565
child 73504 5fc7b3f0bae67ba77280328388d55a58bf96370c
push idunknown
push userunknown
push dateunknown
reviewersdao
bugs674847
milestone8.0a1
Bug 674847 - Make tooltip suppression during tab drag not fragile. r=dao
browser/base/content/browser.css
browser/base/content/tabbrowser.xml
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -58,20 +58,16 @@ tabbrowser {
   -moz-transition: opacity 250ms;
 }
 
 .tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] {
   position: fixed !important;
   display: block; /* position:fixed already does this (bug 579776), but let's be explicit */
 }
 
-.tabbrowser-tabs[drag] > .tabbrowser-tab {
-  pointer-events: none; /* suppress tooltips */
-}
-
 .tabbrowser-tabs[drag] > .tabbrowser-tab[selected] {
   z-index: 2; /* ensure selected tab stays on top despite -moz-transform */
 }
 
 .tabbrowser-tabs[drag] > .tabbrowser-tab[dragged] {
   -moz-transition: 0s; /* suppress opening animation when reattaching tab */
 }
 
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -2451,17 +2451,17 @@
                 onget="return this.mCurrentBrowser.userTypedValue;"
                 onset="return this.mCurrentBrowser.userTypedValue = val;"/>
 
       <method name="createTooltip">
         <parameter name="event"/>
         <body><![CDATA[
           event.stopPropagation();
           var tab = document.tooltipNode;
-          if (tab.localName != "tab") {
+          if (tab.localName != "tab" || this.tabContainer.draggedTab) {
             event.preventDefault();
             return;
           }
           event.target.setAttribute("label", tab.mOverCloseButton ?
                                              tab.getAttribute("closetabtext") :
                                              tab.getAttribute("label"));
         ]]></body>
       </method>