Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor 
Project / Applications / Tor Browser


Commits:
a5293780 by Pier Angelo Vendrame at 2025-08-13T12:39:38+02:00
fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in 
about:preferences#connection

TB 44095: Rename connectionPane.xhtml to .inc.xhtml.

Let's improve consistency.
Also, we need to explicitly enable formatting on this, since .inc.xhtml
files are excluded by default.

- - - - -


4 changed files:

- .prettierignore
- browser/components/preferences/preferences.xhtml
- browser/components/torpreferences/content/connectionPane.xhtml → 
browser/components/torpreferences/content/connectionPane.inc.xhtml
- browser/components/torpreferences/jar.mn


Changes:

=====================================
.prettierignore
=====================================
@@ -1711,6 +1711,8 @@ xpcom/idl-parser/xpidl/fixtures/xpctest.d.json
 
 browser/app/profile/001-base-profile.js
 browser/app/profile/000-tor-browser.js
+# We do not use the preprocessor here, so we can lint it.
+!browser/components/torpreferences/content/connectionPane.inc.xhtml
 mobile/android/app/000-tor-browser-android.js
 toolkit/content/pt_config.json
 toolkit/content/moat_countries_dev_build.json


=====================================
browser/components/preferences/preferences.xhtml
=====================================
@@ -259,7 +259,7 @@
 #include sync.inc.xhtml
 #include experimental.inc.xhtml
 #include moreFromMozilla.inc.xhtml
-#include ../torpreferences/content/connectionPane.xhtml
+#include ../torpreferences/content/connectionPane.inc.xhtml
         </vbox>
       </vbox>
     </vbox>


=====================================
browser/components/torpreferences/content/connectionPane.xhtml → 
browser/components/torpreferences/content/connectionPane.inc.xhtml
=====================================


=====================================
browser/components/torpreferences/jar.mn
=====================================
@@ -28,7 +28,6 @@ browser.jar:
     content/browser/torpreferences/torLogDialog.js                   
(content/torLogDialog.js)
     content/browser/torpreferences/torLogDialog.xhtml                
(content/torLogDialog.xhtml)
     content/browser/torpreferences/connectionPane.js                 
(content/connectionPane.js)
-    content/browser/torpreferences/connectionPane.xhtml              
(content/connectionPane.xhtml)
     content/browser/torpreferences/torPreferences.css                
(content/torPreferences.css)
     content/browser/torpreferences/bridgemoji/BridgeEmoji.js         
(content/bridgemoji/BridgeEmoji.js)
     content/browser/torpreferences/bridgemoji/bridge-emojis.json     
(content/bridgemoji/bridge-emojis.json)



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a5293780a5debfa21c995ca27b1d658c7363db22

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a5293780a5debfa21c995ca27b1d658c7363db22
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
  • [tbb-commits] [Git][tpo/app... Pier Angelo Vendrame (@pierov) via tbb-commits

Reply via email to