Bug 808377 - Ensure that View -> Sidebar -> Social does not appear if social is disabled. r+a=gavin
authorMark Hammond <mhammond@skippinet.com.au>
Mon, 05 Nov 2012 17:51:34 -0800
changeset 109777 518b70ac56cc396078c3e56f34ba66c810bb65b2
parent 109776 6c1314c972a41336ad0b41eed79e3e3f7c2527c2
child 109778 91eb4a93654c26eb20ad6d9998bff28754712402
push id1667
push userfelipc@gmail.com
push dateTue, 06 Nov 2012 01:51:37 +0000
treeherdermozilla-beta@518b70ac56cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs808377
milestone17.0
Bug 808377 - Ensure that View -> Sidebar -> Social does not appear if social is disabled. r+a=gavin
browser/base/content/browser-social.js
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -989,16 +989,18 @@ var SocialSidebar = {
     sbrowser.contentDocument.documentElement.dispatchEvent(evt);
   },
 
   updateSidebar: function SocialSidebar_updateSidebar() {
     clearTimeout(this._unloadTimeoutId);
     // Hide the toggle menu item if the sidebar cannot appear
     let command = document.getElementById("Social:ToggleSidebar");
     command.hidden = !this.canShow;
+    // Bug 772808 - hidden on the command isn't inherited by menuitems.
+    document.getElementById("menu_socialSidebar").hidden = !this.canShow;
 
     // Hide the sidebar if it cannot appear, or has been toggled off.
     // Also set the command "checked" state accordingly.
     let hideSidebar = !this.canShow || !this.opened;
     let broadcaster = document.getElementById("socialSidebarBroadcaster");
     broadcaster.hidden = hideSidebar;
     command.setAttribute("checked", !hideSidebar);