diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-03-30 20:11:32 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-03-30 20:11:32 -0400 |
| commit | 349ceffd890dc29c93b46ee193f52b0801ad0f69 (patch) | |
| tree | db0cb6aa0388ed7993dd89648d61965378af3a54 /application/basilisk/base/content/browser-menubar.inc | |
| parent | 711c9cd6cd08f4fe10eb7544aa3a51dfb863bfeb (diff) | |
| download | UXP-349ceffd890dc29c93b46ee193f52b0801ad0f69.tar UXP-349ceffd890dc29c93b46ee193f52b0801ad0f69.tar.gz UXP-349ceffd890dc29c93b46ee193f52b0801ad0f69.tar.lz UXP-349ceffd890dc29c93b46ee193f52b0801ad0f69.tar.xz UXP-349ceffd890dc29c93b46ee193f52b0801ad0f69.zip | |
[BASILISK] Remove FxA infected Sync - Part 1: Remove or condition CUI and Integration Points
Diffstat (limited to 'application/basilisk/base/content/browser-menubar.inc')
| -rw-r--r-- | application/basilisk/base/content/browser-menubar.inc | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/application/basilisk/base/content/browser-menubar.inc b/application/basilisk/base/content/browser-menubar.inc index 5b89875fd..0af0cc1c7 100644 --- a/application/basilisk/base/content/browser-menubar.inc +++ b/application/basilisk/base/content/browser-menubar.inc @@ -436,12 +436,7 @@ label="&toolsMenu.label;" accesskey="&toolsMenu.accesskey;" onpopupshowing="mirrorShow(this)"> - <menupopup id="menu_ToolsPopup" -# We have to use setTimeout() here to avoid a flickering menu bar when opening -# the Tools menu, see bug 970769. This can be removed once we got rid of the -# event loop spinning in Weave.Status._authManager. - onpopupshowing="setTimeout(() => gSyncUI.updateUI());" - > + <menupopup id="menu_ToolsPopup"> <menuitem id="menu_openDownloads" label="&downloads.label;" accesskey="&downloads.accesskey;" @@ -452,23 +447,6 @@ accesskey="&addons.accesskey;" key="key_openAddons" command="Tools:Addons"/> - - <!-- only one of sync-setup, sync-syncnowitem or sync-reauthitem will be showing at once --> - <menuitem id="sync-setup" - label="&syncSignIn.label;" - accesskey="&syncSignIn.accesskey;" - observes="sync-setup-state" - oncommand="gSyncUI.openSetup(null, 'menubar')"/> - <menuitem id="sync-syncnowitem" - label="&syncSyncNowItem.label;" - accesskey="&syncSyncNowItem.accesskey;" - observes="sync-syncnow-state" - oncommand="gSyncUI.doSync(event);"/> - <menuitem id="sync-reauthitem" - label="&syncReAuthItem.label;" - accesskey="&syncReAuthItem.accesskey;" - observes="sync-reauth-state" - oncommand="gSyncUI.openSignInAgainPage('menubar');"/> <menuseparator id="devToolsSeparator"/> <menu id="webDeveloperMenu" label="&webDeveloperMenu.label;" |