Bug 764245 - Chat emoticons should have tooltips displaying the untransformed text. r=florian, a=bwinton.
authorMike Conley <mconley@mozilla.com>
Mon, 23 Jul 2012 15:25:36 -0400
changeset 12892 c4ae50a781db06eee2e428586b50bcb271ede8cf
parent 12891 da63d81338ee5ec526520e2be9871615eef088a8
child 12893 9ae2aa7edbc0cc8a7b3544ada4c3d837ed95dcf7
push id654
push userbugzilla@standard8.plus.com
push dateMon, 27 Aug 2012 20:27:17 +0000
treeherdercomm-beta@f9b6f18872f3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian, bwinton
bugs764245
Bug 764245 - Chat emoticons should have tooltips displaying the untransformed text. r=florian, a=bwinton.
mail/components/im/content/chat-messenger-overlay.js
mail/components/im/content/chat-messenger-overlay.xul
--- a/mail/components/im/content/chat-messenger-overlay.js
+++ b/mail/components/im/content/chat-messenger-overlay.js
@@ -545,16 +545,17 @@ var chatHandler = {
     else if (item.localName == "imconv") {
       let convDeck = document.getElementById("conversationsDeck");
       if (!item.convView) {
         let conv = document.createElement("imconversation");
         convDeck.appendChild(conv);
         conv.conv = item.conv;
         conv.tab = item;
         conv.setAttribute("contentcontextmenu", "chatConversationContextMenu");
+        conv.setAttribute("contenttooltip", "aHTMLTooltip");
         item.convView = conv;
         document.getElementById("contextSplitter").hidden = false;
         document.getElementById("contextPane").hidden = false;
       }
       else
         item.convView.onConvResize();
 
       convDeck.selectedPanel = item.convView;
--- a/mail/components/im/content/chat-messenger-overlay.xul
+++ b/mail/components/im/content/chat-messenger-overlay.xul
@@ -222,17 +222,18 @@
                 <vbox flex="1" id="noPreviousConvScreen" class="im-placeholder-screen" align="center" pack="center">
                   <hbox id="noPreviousConvBox" class="im-placeholder-box" align="top">
                     <vbox id="noPreviousConvInnerBox" class="im-placeholder-innerbox" flex="1">
                       <description id="noPreviousConvDesc" class="im-placeholder-desc">&chat.noPreviousConv.description;</description>
                     </vbox>
                   </hbox>
                 </vbox>
                 <vbox flex="1" id="logDisplayBrowserBox">
-                  <browser id="conv-log-browser" type="content-conversation" contextmenu="chatConversationContextMenu" flex="1"/>
+                  <browser id="conv-log-browser" type="content-conversation" contextmenu="chatConversationContextMenu" flex="1"
+                           tooltip="aHTMLTooltip"/>
                   <progressmeter id="log-browserProgress" hidden="true"/>
                   <findbar id="log-findbar" browserid="conv-log-browser"/>
                 </vbox>
               </deck>
               <button id="goToConversation" hidden="true"
                       oncommand="chatHandler.showCurrentConversation();"/>
             </vbox>
           </deck>