Backout 4275bc483518 because we shouldn't have landed on relbranch. a=backout. SEA_COMM150_20120720_RELBRANCH
authorMike Conley <mconley@mozilla.com>
Mon, 23 Jul 2012 15:50:04 -0400
branchSEA_COMM150_20120720_RELBRANCH
changeset 12471 b10eb6edc4cc163ec488f9762c08e42a8da82510
parent 12470 7dbb487e16b27fd1be11281a6dd95f813f1928fe
push idunknown
push userunknown
push dateunknown
reviewersbackout
backs out4275bc4835187b96a2bf9bfdac22ed2078c41180
Backout 4275bc483518 because we shouldn't have landed on relbranch. a=backout.
mail/components/im/content/chat-messenger-overlay.js
mail/components/im/content/imconversation.xml
--- a/mail/components/im/content/chat-messenger-overlay.js
+++ b/mail/components/im/content/chat-messenger-overlay.js
@@ -457,17 +457,16 @@ var chatHandler = {
     let statusType = aContact.statusType;
     if (statusText)
       statusText = " - " + statusText;
     cti.setAttribute("statusMessageWithDash", statusText);
     let statusString = Status.toLabel(statusType);
     cti.setAttribute("statusMessage", statusString + statusText);
     cti.setAttribute("status", Status.toAttribute(statusType));
     cti.setAttribute("statusTypeTooltiptext", statusString);
-    cti.setAttribute("statusTooltiptext", statusString + statusText);
     cti.removeAttribute("typing");
     cti.removeAttribute("typed");
 
     let bundle = document.getElementById("chatBundle");
     let button = document.getElementById("goToConversation");
     button.label = bundle.getFormattedString("startAConversationWith.button",
                                              [aContact.displayName]);
     button.disabled = !aContact.canSendMessage;
--- a/mail/components/im/content/imconversation.xml
+++ b/mail/components/im/content/imconversation.xml
@@ -965,19 +965,19 @@
             cti.removeAttribute("topicEditable");
 
           var topic = this._conv.topic;
           if (topic) {
             cti.setAttribute("statusTooltiptext", topic);
             cti.removeAttribute("noTopic");
           }
           else {
-            topic = this.bundle.GetStringFromName("noTopic");
+            cti.removeAttribute("statusTooltiptext");
             cti.setAttribute("noTopic", "true");
-            cti.setAttribute("statusTooltiptext", topic);
+            topic = this.bundle.GetStringFromName("noTopic");
           }
           cti.setAttribute("statusMessage", topic);
           cti.setAttribute("statusMessageWithDash", " - " + topic);
           cti.removeAttribute("userIcon");
        ]]>
        </body>
      </method>
 
@@ -1020,30 +1020,27 @@
           let typingState = this._conv.typingState;
           let cti = document.getElementById("conv-top-info");
           cti.removeAttribute("typing");
           cti.removeAttribute("typed");
 
           let name = this._conv.title;//.replace(/^([a-zA-Z0-9.]+)[@\s].*/, "$1");
           if (typingState == Ci.prplIConvIM.TYPING) {
             cti.setAttribute("typing", "true");
-            let typingMsg = this.bundle.formatStringFromName("chat.contactIsTyping",
-                                                             [name], 1);
-            cti.setAttribute("statusTypeTooltiptext", typingMsg);
-            cti.setAttribute("statusTooltiptext", typingMsg);
+            cti.setAttribute("statusTypeTooltiptext",
+                             this.bundle.formatStringFromName("chat.contactIsTyping",
+                                                              [name], 1));
             cti.setAttribute("statusMessage",
                              this.bundle.GetStringFromName("chat.isTyping"));
           }
           else if (typingState == Ci.prplIConvIM.TYPED) {
             cti.setAttribute("typed", "true");
-
-            let typedMsg = this.bundle.formatStringFromName("chat.contactHasStoppedTyping",
-                                                            [name], 1);
-            cti.setAttribute("statusTypeTooltiptext", typedMsg);
-            cti.setAttribute("statusTooltiptext", typedMsg);
+            cti.setAttribute("statusTypeTooltiptext",
+                             this.bundle.formatStringFromName("chat.contactHasStoppedTyping",
+                                                              [name], 1));
             cti.setAttribute("statusMessage",
                              this.bundle.GetStringFromName("chat.hasStoppedTyping"));
           }
        ]]>
        </body>
      </method>
 
      <method name="getElt">
@@ -1088,17 +1085,16 @@
             cti.setAttribute("displayName", displayName);
             if (statusText)
               statusText = " - " + statusText;
             cti.setAttribute("statusMessageWithDash", statusText);
             let statusString = Status.toLabel(statusType);
             cti.setAttribute("statusMessage", statusString + statusText);
             cti.setAttribute("status", Status.toAttribute(statusType));
             cti.setAttribute("statusTypeTooltiptext", statusString);
-            cti.setAttribute("statusTooltiptext", statusString + statusText);
             this.updateTyping();
           }
        ]]>
        </body>
      </method>
 
      <method name="showParticipants">
        <body>