From 8844b141bfbe9d1620d60b5fde4225124409585c Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Sun, 3 Jun 2018 20:11:54 +0200 Subject: [PALEMOON] Fix the Findbar - open when you press "/" or "'" keys Issue #430 --- toolkit/content/jar.mn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolkit/content/jar.mn') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index f0d4a62a4..72a7952c4 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -37,8 +37,8 @@ toolkit.jar: content/global/plugins.html content/global/plugins.css content/global/browser-child.js - content/global/browser-content.js -* content/global/buildconfig.html +* content/global/browser-content.js +* content/global/buildconfig.html content/global/contentAreaUtils.js #ifndef MOZ_FENNEC content/global/customizeToolbar.css @@ -56,7 +56,7 @@ toolkit.jar: content/global/filepicker.properties content/global/globalOverlay.js content/global/memoriam.xhtml -* content/global/mozilla.css +* content/global/mozilla.css content/global/mozilla.xhtml #ifdef MOZ_PHOENIX content/global/logopage.xhtml -- cgit v1.2.3 From e08b25667f20c83cd66e7f55dd98f16ae982974b Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Wed, 13 Jun 2018 17:31:46 +0200 Subject: Add architecture detection to "about:" and "about:support" Issue #492 --- toolkit/content/jar.mn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolkit/content/jar.mn') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 72a7952c4..a5db7e3a1 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -8,7 +8,7 @@ toolkit.jar: content/global/textbox.css content/global/menulist.css content/global/autocomplete.css - content/global/about.js +* content/global/about.js content/global/about.xhtml content/global/aboutAbout.js content/global/aboutAbout.xhtml -- cgit v1.2.3 From 38f30cdf759e4f6da96da777c3216b5047d672c1 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Mon, 18 Jun 2018 12:21:11 +0200 Subject: [PALEMOON] Findbar - remove unnecessary code (Findbar is no longer in the gBrowser) Issue #513 --- toolkit/content/jar.mn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolkit/content/jar.mn') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index a5db7e3a1..acec1bdf1 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -37,7 +37,7 @@ toolkit.jar: content/global/plugins.html content/global/plugins.css content/global/browser-child.js -* content/global/browser-content.js + content/global/browser-content.js * content/global/buildconfig.html content/global/contentAreaUtils.js #ifndef MOZ_FENNEC -- cgit v1.2.3 From dcabdf826967ceca7e2049f6cddcf9172b01c8d7 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Sat, 23 Jun 2018 23:04:10 +0200 Subject: Build - fix "ERROR: preprocessor was not applied to aboutRights.xhtml" --- toolkit/content/jar.mn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolkit/content/jar.mn') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index acec1bdf1..ca1a602a9 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -13,9 +13,9 @@ toolkit.jar: content/global/aboutAbout.js content/global/aboutAbout.xhtml #ifdef MC_OFFICIAL - content/global/aboutRights.xhtml +* content/global/aboutRights.xhtml #else - content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml) +* content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml) #endif content/global/aboutNetworking.js content/global/aboutNetworking.xhtml -- cgit v1.2.3 From 9755c93cff958fd8f1a9ef1a105ef0aafd6f9669 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 24 Jun 2018 23:57:19 +0200 Subject: Make about:webrtc conditional. This resolves #536 --- toolkit/content/jar.mn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'toolkit/content/jar.mn') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index ca1a602a9..c8dd6dc47 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -25,9 +25,11 @@ toolkit.jar: #endif content/global/aboutServiceWorkers.js content/global/aboutServiceWorkers.xhtml +#ifdef MOZ_WEBRTC content/global/aboutwebrtc/aboutWebrtc.css (aboutwebrtc/aboutWebrtc.css) content/global/aboutwebrtc/aboutWebrtc.js (aboutwebrtc/aboutWebrtc.js) content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html) +#endif * content/global/aboutSupport.js * content/global/aboutSupport.xhtml content/global/aboutTelemetry.js -- cgit v1.2.3 From 23d70a95d85e001a29945642ddf7cca6b32f15a3 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 27 Jun 2018 17:27:40 +0200 Subject: Reorganize some internal pages. --- toolkit/content/jar.mn | 2 -- 1 file changed, 2 deletions(-) (limited to 'toolkit/content/jar.mn') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index c8dd6dc47..0c0f9494a 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -57,8 +57,6 @@ toolkit.jar: #endif content/global/filepicker.properties content/global/globalOverlay.js - content/global/memoriam.xhtml -* content/global/mozilla.css content/global/mozilla.xhtml #ifdef MOZ_PHOENIX content/global/logopage.xhtml -- cgit v1.2.3 From b94e5a3a4a3088a96db7166c244721d230845231 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 6 Jul 2018 10:22:24 +0200 Subject: Fix redirector paths This resolves #602. --- toolkit/content/jar.mn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolkit/content/jar.mn') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 0c0f9494a..e1d432cb3 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -12,7 +12,7 @@ toolkit.jar: content/global/about.xhtml content/global/aboutAbout.js content/global/aboutAbout.xhtml -#ifdef MC_OFFICIAL +#ifdef MOZ_OFFICIAL_BRANDING * content/global/aboutRights.xhtml #else * content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml) -- cgit v1.2.3