Back out b65289e2b06c (bug 853642) because of mochitest failures on a CLOSED TREE

This commit is contained in:
Matt Brubeck 2013-03-22 15:58:16 -07:00
parent 7b0efe8208
commit 87f7e9bbf1
3 changed files with 6 additions and 4 deletions

View File

@ -542,9 +542,9 @@
key="focusChatBar"
command="Social:FocusChat"
class="show-only-for-keyboard"/>
<menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
<menuseparator class="social-statusarea-separator"/>
<menuseparator class="social-provider-menu" hidden="true"/>
<menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
<menuitem class="social-addons-menuitem" command="Social:Addons"
label="&social.addons.label;"/>
</menupopup>

View File

@ -170,10 +170,12 @@ let SocialUI = {
},
_updateMenuItems: function () {
let provider = Social.provider || Social.defaultProvider;
if (!Social.provider)
return;
// The View->Sidebar and Menubar->Tools menu.
for (let id of ["menu_socialSidebar", "menu_socialAmbientMenu"])
document.getElementById(id).setAttribute("label", provider.name);
document.getElementById(id).setAttribute("label", Social.provider.name);
},
// This handles "ActivateSocialFeature" events fired against content documents

View File

@ -713,9 +713,9 @@
command="Social:ToggleNotifications"
label="&social.toggleNotifications.label;"
accesskey="&social.toggleNotifications.accesskey;"/>
<menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
<menuseparator class="social-statusarea-separator"/>
<menuseparator class="social-provider-menu" hidden="true"/>
<menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
<menuitem class="social-addons-menuitem" command="Social:Addons"
label="&social.addons.label;"/>
</menupopup>