bug 850077 make tooltips work in social content, r=felipc, a=gavin
authorShane Caraveo <scaraveo@mozilla.com>
Mon, 18 Mar 2013 12:43:51 -0700
changeset 132445 b01807d9550e5e61d769d2a02b80fefef6e50da9
parent 132444 bd540c74113639eb059a713e267a400ac323a238
child 132446 975dd3ef768d7684e59fd6551499d6f4083ce05e
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipc, gavin
bugs850077
milestone21.0a2
bug 850077 make tooltips work in social content, r=felipc, a=gavin
browser/base/content/browser-social.js
browser/base/content/browser.xul
browser/base/content/socialchat.xml
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -438,16 +438,17 @@ let SocialFlyout = {
     let panel = this.panel;
     if (!SocialUI.enabled || panel.firstChild)
       return;
     // create and initialize the panel for this window
     let iframe = document.createElement("iframe");
     iframe.setAttribute("type", "content");
     iframe.setAttribute("class", "social-panel-frame");
     iframe.setAttribute("flex", "1");
+    iframe.setAttribute("tooltip", "aHTMLTooltip");
     iframe.setAttribute("origin", Social.provider.origin);
     panel.appendChild(iframe);
   },
 
   setFlyoutErrorMessage: function SF_setFlyoutErrorMessage() {
     let iframe = this.panel.firstChild;
     if (!iframe)
       return;
@@ -878,16 +879,17 @@ var SocialToolbar = {
         notificationFrame = SharedFrame.createFrame(
           notificationFrameId, /* frame name */
           panel, /* parent */
           {
             "type": "content",
             "mozbrowser": "true",
             "class": "social-panel-frame",
             "id": notificationFrameId,
+            "tooltip": "aHTMLTooltip",
 
             // work around bug 793057 - by making the panel roughly the final size
             // we are more likely to have the anchor in the correct position.
             "style": "width: " + PANEL_MIN_WIDTH + "px;",
 
             "origin": Social.provider.origin,
             "src": icon.contentPanel
           }
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1094,16 +1094,17 @@
     <vbox id="social-sidebar-box"
           class="chromeclass-extrachrome"
           observes="socialSidebarBroadcaster"
           persist="width">
       <browser id="social-sidebar-browser"
                type="content"
                context="contentAreaContextMenu"
                disableglobalhistory="true"
+               tooltip="aHTMLTooltip"
                flex="1"
                style="min-width: 14em; width: 18em; max-width: 36em;"/>
     </vbox>
     <vbox id="browser-border-end" hidden="true" layer="true"/>
   </hbox>
 
   <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
     <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
--- a/browser/base/content/socialchat.xml
+++ b/browser/base/content/socialchat.xml
@@ -11,16 +11,17 @@
                 onclick="document.getBindingParent(this).onTitlebarClick(event);" align="baseline">
         <xul:image class="chat-status-icon" xbl:inherits="src=image"/>
         <xul:label class="chat-title" flex="1" xbl:inherits="value=label" crop="center"/>
         <xul:toolbarbutton class="chat-close-button chat-toolbarbutton"
                            oncommand="document.getBindingParent(this).close();"/>
       </xul:hbox>
       <xul:iframe anonid="iframe" class="chat-frame" flex="1"
                   context="contentAreaContextMenu"
+                  tooltip="aHTMLTooltip"
                   xbl:inherits="src,origin,collapsed=minimized" type="content"/>
     </content>
 
     <implementation implements="nsIDOMEventListener">
       <field name="iframe" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "iframe");
       </field>