[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] 4 commits: dropme! Bug 10760: Integrate TorButton to TorBrowser core

[Richard Pospesel (@richard)]

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser


Commits:
36693159 by Pier Angelo Vendrame at 2023-03-03T10:05:00+01:00
dropme! Bug 10760: Integrate TorButton to TorBrowser core

Remove implementation of 18905 from Torbutton

- - - - -
5ff98c20 by Arthur Edelstein at 2023-03-03T10:05:33+01:00
Bug 18905: Hide unwanted items from help menu

Bug 25660: Remove the "New Private Window" option

- - - - -
777cb20b by Pier Angelo Vendrame at 2023-03-03T10:05:40+01:00
fixup! Bug 10760: Integrate TorButton to TorBrowser core

Bring back the new circuit entries.

- - - - -
7de98cbe by Pier Angelo Vendrame at 2023-03-03T10:05:47+01:00
fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser

Move the manual menu entry to the manual commit

- - - - -


2 changed files:

- browser/base/content/browser-menubar.inc
- browser/base/content/browser-safebrowsing.js


Changes:

=====================================
browser/base/content/browser-menubar.inc
=====================================
@@ -461,17 +461,11 @@
               <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
 <!-- Note: Items under here are cloned to the AppMenu Help submenu. The cloned items
      have their strings defined by appmenu-data-l10n-id. -->
-                <!-- dummy elements to avoid 'getElementById' errors -->
-                <box id="feedbackPage"/>
-                <box id="helpSafeMode"/>
-                <box id="menu_HelpPopup_reportPhishingtoolmenu"/>
-                <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/>
                 <!-- Add Tor Browser manual link -->
                 <menuitem id="torBrowserUserManual"
                           oncommand="gBrowser.selectedTab = gBrowser.addTab('about:manual', {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});"
                           label="&aboutTor.torbrowser_user_manual.label;"
                           accesskey="&aboutTor.torbrowser_user_manual.accesskey;"/>
-                <!-- Bug 18905: Hide unused help menu items -->
                 <menuitem id="menu_openHelp"
                           oncommand="openHelpLink('firefox-help')"
                           hidden="true"
@@ -485,8 +479,8 @@
                 <menuitem id="feedbackPage"
                           oncommand="openFeedbackPage()"
                           hidden="true"
-                          data-l10n-id="menu-help-feedback-page"
-                          appmenu-data-l10n-id="appmenu-help-feedback-page"/>
+                          data-l10n-id="menu-help-share-ideas"
+                          appmenu-data-l10n-id="appmenu-help-share-ideas"/>
                 <menuitem id="helpSafeMode"
                           oncommand="safeModeRestart();"
                           hidden="true"


=====================================
browser/base/content/browser-safebrowsing.js
=====================================
@@ -7,6 +7,13 @@
 
 var gSafeBrowsing = {
   setReportPhishingMenu() {
+    // tor-browser#18905: hide these menu entries
+    if (
+      !Services.prefs.getBoolPref("browser.safebrowsing.phishing.enabled", true)
+    ) {
+      return;
+    }
+
     // In order to detect whether or not we're at the phishing warning
     // page, we have to check the documentURI instead of the currentURI.
     // This is because when the DocShell loads an error page, the



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/486cbe1fb570f4e8e575f02cc7dbf6620ddb4d9e...7de98cbed3a0524171950a92c3fc1859daaff7a3

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/486cbe1fb570f4e8e575f02cc7dbf6620ddb4d9e...7de98cbed3a0524171950a92c3fc1859daaff7a3
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230303/771c8fea/attachment-0001.htm>