From e9a58eae57e65b082b461ec17aaf4bef9bb582f9 Mon Sep 17 00:00:00 2001
From: JustOff <Off.Just.Off@gmail.com>
Date: Sat, 3 Nov 2018 18:18:25 +0200
Subject: [PALEMOON] Focus and select the first non-collapsed text element in
 the bookmark properties dialog

---
 .../palemoon/components/places/content/editBookmarkOverlay.js        | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'application/palemoon')

diff --git a/application/palemoon/components/places/content/editBookmarkOverlay.js b/application/palemoon/components/places/content/editBookmarkOverlay.js
index 69d7d32eb..e3d4537c7 100644
--- a/application/palemoon/components/places/content/editBookmarkOverlay.js
+++ b/application/palemoon/components/places/content/editBookmarkOverlay.js
@@ -222,6 +222,11 @@ var gEditItemOverlay = {
     }
 
     let focusElement = () => {
+      let elt = document.querySelector("textbox:not([collapsed=true])");
+      if (elt) {
+        elt.focus();
+        elt.select();
+      }
       this._initialized = true;
     };
 
-- 
cgit v1.2.3


From bb3f5cef325cc1a1e3d0d383bd34e4a35fb25c49 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 4 Nov 2018 17:59:16 +0100
Subject: Add GUI control to Pale Moon for opportunistic encryption.

Pale Moon part for #863.
---
 application/palemoon/components/preferences/security.xul          | 8 ++++++++
 .../locales/en-US/chrome/browser/preferences/security.dtd         | 2 ++
 2 files changed, 10 insertions(+)

(limited to 'application/palemoon')

diff --git a/application/palemoon/components/preferences/security.xul b/application/palemoon/components/preferences/security.xul
index d3d321b16..d9c3dd55d 100644
--- a/application/palemoon/components/preferences/security.xul
+++ b/application/palemoon/components/preferences/security.xul
@@ -49,6 +49,10 @@
       <preference id="security.cert_pinning.enforcement_level"
                   name="security.cert_pinning.enforcement_level"
                   type="int"/>
+                  
+      <preference id="network.http.opportunistic-encryption"
+                  name="network.http.opportunistic-encryption"
+                  type="bool"/>
       
       <!-- XSS Filter -->
       <!--
@@ -144,6 +148,10 @@
                   oncommand="gSecurityPane.updateHPKPPref();"/>
       </vbox>
     </groupbox>
+    
+    <checkbox id="enableOpEnc"
+              label="&enableOpEnc.label;"
+              preference="network.http.opportunistic-encryption" />
 
     <!-- XSS Filter -->
     <!--
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
index 2bd3b3aec..d88c55dc5 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
@@ -40,6 +40,8 @@
 <!ENTITY  enableHPKP.label           "Enable Certificate Key Pinning (HPKP)">
 <!ENTITY  enableHPKP.accesskey       "C">
 
+<!ENTITY  enableOpEnc.label          "Enable Opportunistic Encryption">
+
 <!ENTITY  XSSFilt.label              "XSS Filter">
 <!ENTITY  enableXSSFilt.label        "Enable XSS filter">
 <!ENTITY  enableXSSFilt.accesskey    "f">
-- 
cgit v1.2.3


From 79487a1a05a9e912c63d7a5259db2eccfc59af2b Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 4 Nov 2018 23:39:37 +0100
Subject: Backout opportunistic encryption changes.

Apparently there is some functional and naming confusion here.
Backing out to re-land after evaluation and possible changes.
Tag #863.
---
 application/palemoon/components/preferences/security.xul          | 8 --------
 .../locales/en-US/chrome/browser/preferences/security.dtd         | 2 --
 2 files changed, 10 deletions(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/components/preferences/security.xul b/application/palemoon/components/preferences/security.xul
index d9c3dd55d..d3d321b16 100644
--- a/application/palemoon/components/preferences/security.xul
+++ b/application/palemoon/components/preferences/security.xul
@@ -49,10 +49,6 @@
       <preference id="security.cert_pinning.enforcement_level"
                   name="security.cert_pinning.enforcement_level"
                   type="int"/>
-                  
-      <preference id="network.http.opportunistic-encryption"
-                  name="network.http.opportunistic-encryption"
-                  type="bool"/>
       
       <!-- XSS Filter -->
       <!--
@@ -148,10 +144,6 @@
                   oncommand="gSecurityPane.updateHPKPPref();"/>
       </vbox>
     </groupbox>
-    
-    <checkbox id="enableOpEnc"
-              label="&enableOpEnc.label;"
-              preference="network.http.opportunistic-encryption" />
 
     <!-- XSS Filter -->
     <!--
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
index d88c55dc5..2bd3b3aec 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
@@ -40,8 +40,6 @@
 <!ENTITY  enableHPKP.label           "Enable Certificate Key Pinning (HPKP)">
 <!ENTITY  enableHPKP.accesskey       "C">
 
-<!ENTITY  enableOpEnc.label          "Enable Opportunistic Encryption">
-
 <!ENTITY  XSSFilt.label              "XSS Filter">
 <!ENTITY  enableXSSFilt.label        "Enable XSS filter">
 <!ENTITY  enableXSSFilt.accesskey    "f">
-- 
cgit v1.2.3


From a0a37ffd4a9410435b2dd45f372732cb802567f7 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Mon, 5 Nov 2018 15:58:39 +0100
Subject: #863 Part 3: Add Pale Moon GUI options for Opportunistic Encryption.

---
 .../palemoon/components/preferences/security.xul      | 19 +++++++++++++++++++
 .../en-US/chrome/browser/preferences/security.dtd     |  4 ++++
 2 files changed, 23 insertions(+)

(limited to 'application/palemoon')

diff --git a/application/palemoon/components/preferences/security.xul b/application/palemoon/components/preferences/security.xul
index d3d321b16..b12946f2a 100644
--- a/application/palemoon/components/preferences/security.xul
+++ b/application/palemoon/components/preferences/security.xul
@@ -50,6 +50,15 @@
                   name="security.cert_pinning.enforcement_level"
                   type="int"/>
       
+      <!-- Opportunistic Encryption -->
+                  
+      <preference id="network.http.upgrade-insecure-requests"
+                  name="network.http.upgrade-insecure-requests"
+                  type="bool"/>
+      <preference id="network.http.altsvc.oe"
+                  name="network.http.altsvc.oe"
+                  type="bool"/>
+      
       <!-- XSS Filter -->
       <!--
       <preference id="security.xssfilter.enable" name="security.xssfilter.enable" type="bool"/>
@@ -144,6 +153,16 @@
                   oncommand="gSecurityPane.updateHPKPPref();"/>
       </vbox>
     </groupbox>
+    
+    <groupbox id="OpportunisticEncryption">
+      <caption label="&OpEnc.label;"/>
+      <checkbox id="enableUIROpEnc"
+                label="&enableUIROpEnc.label;"
+                preference="network.http.upgrade-insecure-requests" />
+      <checkbox id="enableAltSvcOpEnc"
+                label="&enableAltSvcOpEnc.label;"
+                preference="network.http.altsvc.oe" />
+    </groupbox>    
 
     <!-- XSS Filter -->
     <!--
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
index 2bd3b3aec..930736d56 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/security.dtd
@@ -40,6 +40,10 @@
 <!ENTITY  enableHPKP.label           "Enable Certificate Key Pinning (HPKP)">
 <!ENTITY  enableHPKP.accesskey       "C">
 
+<!ENTITY  OpEnc.label                "Opportunistic Encryption (OE)">
+<!ENTITY  enableUIROpEnc.label       "Enable Upgrade Insecure Requests">
+<!ENTITY  enableAltSvcOpEnc.label    "Enable HTTP Alternative Services for OE">
+
 <!ENTITY  XSSFilt.label              "XSS Filter">
 <!ENTITY  enableXSSFilt.label        "Enable XSS filter">
 <!ENTITY  enableXSSFilt.accesskey    "f">
-- 
cgit v1.2.3