Back out 5bbfcd1d5296 (bug 805206) for browser-chrome failures

This commit is contained in:
Phil Ringnalda 2012-10-24 22:35:25 -07:00
parent df721374f4
commit 93ae79dc82

View File

@ -98,11 +98,6 @@ let SocialUI = {
toggleCommand.setAttribute("label", label); toggleCommand.setAttribute("label", label);
toggleCommand.setAttribute("accesskey", accesskey); toggleCommand.setAttribute("accesskey", accesskey);
let kbMenuitem = document.getElementById("menu_socialAmbientMenu");
kbMenuitem.hidden = !Social.enabled;
kbMenuitem.setAttribute("label", label);
kbMenuitem.setAttribute("accesskey", accesskey);
SocialToolbar.init(); SocialToolbar.init();
SocialShareButton.init(); SocialShareButton.init();
SocialSidebar.init(); SocialSidebar.init();
@ -613,7 +608,6 @@ var SocialMenu = {
let ambientMenuItems = submenu.getElementsByClassName("ambient-menuitem"); let ambientMenuItems = submenu.getElementsByClassName("ambient-menuitem");
for (let ambientMenuItem of ambientMenuItems) for (let ambientMenuItem of ambientMenuItems)
submenu.removeChild(ambientMenuItem); submenu.removeChild(ambientMenuItem);
separator.hidden = true;
let provider = Social.provider; let provider = Social.provider;
if (Social.active && provider) { if (Social.active && provider) {
let iconNames = Object.keys(provider.ambientNotificationIcons); let iconNames = Object.keys(provider.ambientNotificationIcons);
@ -622,7 +616,6 @@ var SocialMenu = {
let icon = provider.ambientNotificationIcons[name]; let icon = provider.ambientNotificationIcons[name];
if (!icon.label || !icon.menuURL) if (!icon.label || !icon.menuURL)
continue; continue;
separator.hidden = false;
let menuitem = document.createElement("menuitem"); let menuitem = document.createElement("menuitem");
menuitem.setAttribute("label", icon.label); menuitem.setAttribute("label", icon.label);
menuitem.classList.add("ambient-menuitem"); menuitem.classList.add("ambient-menuitem");
@ -631,7 +624,9 @@ var SocialMenu = {
}, false); }, false);
submenu.insertBefore(menuitem, separator); submenu.insertBefore(menuitem, separator);
} }
separator.hidden = !iconNames.length;
} }
document.getElementById("menu_socialAmbientMenu").hidden = !Social.enabled;
} }
}; };