From afba19a290cd6885cab8c4c238c76028104fe48d Mon Sep 17 00:00:00 2001
From: Procyon-b <40043075+Procyon-b@users.noreply.github.com>
Date: Sun, 24 Jun 2018 16:48:00 -0400
Subject: [PATCH 1/5] DOMContentLoaded/load timer; name=""

Fixes for #14 - as zipped at
https://github.com/gregsadetsky/chrome-dont-add-custom-search-engines/issues/14#issuecomment-399790728
---
 src/content.js | 74 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 59 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 src/content.js

diff --git a/src/content.js b/src/content.js
old mode 100644
new mode 100755
index 706b697..702b9c4
--- a/src/content.js
+++ b/src/content.js
@@ -1,11 +1,27 @@
-const DEBUG=false;
+const DEBUG=true;
 let numseen=0, numspoiled=0;
 let unspoiled=[];
 
+// called when the user clicks an element of the form (any field or button). The parameter passed if the event object
+function clickApply(e) {
+  if(DEBUG) console.info({'form onclick':e});
+  // remove onclick. One fix only
+  e.srcElement.form.removeEventListener("click", clickApply);
+  applyFix(e.srcElement.form);
+}
+
+// add a new <textarea> element
+function applyFix(elem) {
+  var newelem = document.createElement('textarea');
+  newelem.name = '';
+  newelem.style.display='none';
+  elem.appendChild(newelem);
+}
+
 // Add an extra child input to any form that only has one
 function spoilFormGet(elem) {
     if(DEBUG) {
-        console.info({Found: elem});
+        console.info({t:this, Found: elem});
         ++numseen;
         unspoiled.push(elem);
     }
@@ -27,11 +43,15 @@ function spoilFormGet(elem) {
 
     // Add a <textarea> - unlike <input>, it doesn't block implicit submission
     // per https://www.tjvantoll.com/2013/01/01/enter-should-submit-forms-stop-messing-with-that/
-    var newelem;
-    newelem = document.createElement('textarea');
-    newelem.name = 'chrome_dont_add_custom_search_engines_srsly';
-    newelem.style.display='none';
-    elem.appendChild(newelem);
+
+    // apply the fix now, or place it in onclick.  "this" is a parameter passed by foreach(). see below
+    if (this == true) {
+      // remove onclick placed during first pass
+      elem.removeEventListener("click", clickApply);
+      // and instead do it now;
+      applyFix(elem);
+      }
+    else elem.addEventListener('click', clickApply);
 
     if(DEBUG) {
         console.info({Spoiled: elem});
@@ -40,6 +60,22 @@ function spoilFormGet(elem) {
     }
 } //spoilFormGet
 
+var debugAutoDetect=0
+// move this part of the code here, since it's called 3 times
+function autoDetect(now,cmt) {
+    if(DEBUG) console.log('autoDetect: '+(++debugAutoDetect)+' ('+cmt+')')
+    document.querySelectorAll('form:-webkit-any([method="get" i],:not([method]))').forEach(spoilFormGet,now);
+    if(DEBUG) {
+        console.log(`Spoiled ${numspoiled}/${numseen}.  Unspoiled were:`);
+        console.log(unspoiled);
+    }
+
+    // we reset spoil vars for next call
+    numseen=0;
+    numspoiled=0;
+    unspoiled=[];
+}
+
 function main() {   // runs on DOMContentLoaded
 
     // OpenSearch - e.g., https://martin-thoma.com/search-engine-autodiscovery/
@@ -59,17 +95,25 @@ function main() {   // runs on DOMContentLoaded
         }
     );
 
-    // Chrome autodetection, https://www.chromium.org/tab-to-search #2 .
-    window.addEventListener('load', function() {
-        document.querySelectorAll('form:-webkit-any([method="get" i],:not([method]))').forEach(spoilFormGet);
+    // if URL has a path, no autodetection will be performed. So only perform "spoil" when path is "/"
+    // Chrome autodetection, https://www.chromium.org/tab-to-search #2
+
+    // #1 call it now without applying the fix
+    // #2 call it in 1500 ms  and applies the fix
+    // #3 call when document loaded, and applies the fix
+    // if <form> are added/modified dynamically before the document is fully loaded #1 could miss it,
+    // but not #2 & #3. Note that #2 could fire after #3 if the page is fast to load.
+    // Once the fix is applied, the <form> can't be found by subsequent execution ot autoDetect,
+    // so the fix can only be applied once (#1 is not applied but delayed until #2 or #3 fires, or if the user clicks).
+
+    window.addEventListener('load', function() { autoDetect(true,'Load'); } );
+    setTimeout(function() { autoDetect(true,'Timer'); } ,1500);
+    autoDetect(false,'onClick');
 
-        if(DEBUG) {
-            console.log(`Spoiled ${numspoiled}/${numseen}.  Unspoiled were:`);
-            console.log(unspoiled);
-        }
-    });
 } //main
 
+var cc=0;
+
 document.addEventListener('DOMContentLoaded', main);
 
 // vi: set ts=4 sts=4 sw=4 et ai: //

From 20f92fbe0342eb107591107cf29163897f467d7f Mon Sep 17 00:00:00 2001
From: Chris White <chrisw@leehayes.com>
Date: Tue, 7 Aug 2018 09:18:30 -0400
Subject: [PATCH 2/5] Bumped version number for development [minor]

---
 src/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/manifest.json b/src/manifest.json
index 8d136f0..e385b20 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
   "author": "Greg Sadetsky et al.",
   "manifest_version": 2,
   "name": "Don't add custom search engines",
-  "version": "0.0.4",
+  "version": "0.0.4.1",
   "description": "Prevent Google Chrome from auto-adding custom search engines",
   "minimum_chrome_version": "49.0.0.0",
   "offline_enabled": true,

From a530810259da87ff6aa722cec850886fe4a641d2 Mon Sep 17 00:00:00 2001
From: Procyon-b <40043075+Procyon-b@users.noreply.github.com>
Date: Wed, 8 Aug 2018 15:51:30 -0400
Subject: [PATCH 3/5] Updates to try and catch yandex.ru (#16)

---
 src/content.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/content.js b/src/content.js
index 702b9c4..9ac6a67 100755
--- a/src/content.js
+++ b/src/content.js
@@ -2,7 +2,7 @@ const DEBUG=true;
 let numseen=0, numspoiled=0;
 let unspoiled=[];
 
-// called when the user clicks an element of the form (any field or button). The parameter passed if the event object
+// called when the user clicks an element of the form (any field or button). The parameter passed is the event object
 function clickApply(e) {
   if(DEBUG) console.info({'form onclick':e});
   // remove onclick. One fix only
@@ -21,7 +21,7 @@ function applyFix(elem) {
 // Add an extra child input to any form that only has one
 function spoilFormGet(elem) {
     if(DEBUG) {
-        console.info({t:this, Found: elem});
+        // cleaning debug output. comment out, this is displayed in "unspoiled": //console.info({t:this, Found: elem});
         ++numseen;
         unspoiled.push(elem);
     }
@@ -36,14 +36,14 @@ function spoilFormGet(elem) {
     // Autodetection requires exactly one input of type text or search
     // If the type attribute is missing, it defaults to `text`
     // Readonly inputs do not count against this total
-    if(elem.querySelectorAll(':scope input:-webkit-any([type="text" i],[type="search" i],:not([type])):not([readonly])').length !== 1) return;
+    if(elem.querySelectorAll(':scope input:-webkit-any([type="text" i],[type="search" i],:not([type])):not([readonly])[name]').length !== 1) return;
 
     // Autodetection also requires no password, file, or textarea elements
     if(elem.querySelector(':scope :-webkit-any(input[type="password" i],input[type="file" i],textarea)')) return;
 
     // Add a <textarea> - unlike <input>, it doesn't block implicit submission
     // per https://www.tjvantoll.com/2013/01/01/enter-should-submit-forms-stop-messing-with-that/
-
+    
     // apply the fix now, or place it in onclick.  "this" is a parameter passed by foreach(). see below
     if (this == true) {
       // remove onclick placed during first pass
@@ -66,8 +66,8 @@ function autoDetect(now,cmt) {
     if(DEBUG) console.log('autoDetect: '+(++debugAutoDetect)+' ('+cmt+')')
     document.querySelectorAll('form:-webkit-any([method="get" i],:not([method]))').forEach(spoilFormGet,now);
     if(DEBUG) {
-        console.log(`Spoiled ${numspoiled}/${numseen}.  Unspoiled were:`);
-        console.log(unspoiled);
+        console.log(`Spoiled ${numspoiled}/${numseen}.`+(unspoiled.length?'  Unspoiled were:':'') );
+        if (unspoiled.length) console.log(unspoiled);
     }
 
     // we reset spoil vars for next call
@@ -95,15 +95,12 @@ function main() {   // runs on DOMContentLoaded
         }
     );
 
-    // if URL has a path, no autodetection will be performed. So only perform "spoil" when path is "/"
-    // Chrome autodetection, https://www.chromium.org/tab-to-search #2
-
     // #1 call it now without applying the fix
-    // #2 call it in 1500 ms  and applies the fix
-    // #3 call when document loaded, and applies the fix
-    // if <form> are added/modified dynamically before the document is fully loaded #1 could miss it,
+    // #2 call it in 1500 ms  and apply the fix
+    // #3 call when document loaded, and apply the fix
+    // if <form> is added/modified dynamically before the document is fully loaded #1 could miss it,
     // but not #2 & #3. Note that #2 could fire after #3 if the page is fast to load.
-    // Once the fix is applied, the <form> can't be found by subsequent execution ot autoDetect,
+    // Once the fix is applied, the <form> can't be found by subsequent execution of autoDetect,
     // so the fix can only be applied once (#1 is not applied but delayed until #2 or #3 fires, or if the user clicks).
 
     window.addEventListener('load', function() { autoDetect(true,'Load'); } );

From 58a4c60f8329e56a5f99e1476ca3663305c77bac Mon Sep 17 00:00:00 2001
From: Procyon-b <40043075+Procyon-b@users.noreply.github.com>
Date: Thu, 9 Aug 2018 08:25:57 -0400
Subject: [PATCH 4/5] Fixes per discussion in #16

Updated CSS selector, and using === with this.now in spoilFormGet
---
 src/content.js | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)
 mode change 100755 => 100644 src/content.js

diff --git a/src/content.js b/src/content.js
old mode 100755
new mode 100644
index 9ac6a67..8b806c4
--- a/src/content.js
+++ b/src/content.js
@@ -21,7 +21,6 @@ function applyFix(elem) {
 // Add an extra child input to any form that only has one
 function spoilFormGet(elem) {
     if(DEBUG) {
-        // cleaning debug output. comment out, this is displayed in "unspoiled": //console.info({t:this, Found: elem});
         ++numseen;
         unspoiled.push(elem);
     }
@@ -36,22 +35,23 @@ function spoilFormGet(elem) {
     // Autodetection requires exactly one input of type text or search
     // If the type attribute is missing, it defaults to `text`
     // Readonly inputs do not count against this total
-    if(elem.querySelectorAll(':scope input:-webkit-any([type="text" i],[type="search" i],:not([type])):not([readonly])[name]').length !== 1) return;
+    if(elem.querySelectorAll(':scope input:-webkit-any([type="text" i],[type="search" i],:not([type])):not([readonly])[name]:not([name=""])').length !== 1) return;
 
     // Autodetection also requires no password, file, or textarea elements
     if(elem.querySelector(':scope :-webkit-any(input[type="password" i],input[type="file" i],textarea)')) return;
 
     // Add a <textarea> - unlike <input>, it doesn't block implicit submission
     // per https://www.tjvantoll.com/2013/01/01/enter-should-submit-forms-stop-messing-with-that/
-    
+
     // apply the fix now, or place it in onclick.  "this" is a parameter passed by foreach(). see below
-    if (this == true) {
-      // remove onclick placed during first pass
-      elem.removeEventListener("click", clickApply);
-      // and instead do it now;
-      applyFix(elem);
-      }
-    else elem.addEventListener('click', clickApply);
+    if (this.now === true) {
+        // remove onclick placed during first pass
+        elem.removeEventListener("click", clickApply);
+        // and instead do it now;
+        applyFix(elem);
+    } else {
+        elem.addEventListener('click', clickApply);
+    }
 
     if(DEBUG) {
         console.info({Spoiled: elem});
@@ -60,11 +60,12 @@ function spoilFormGet(elem) {
     }
 } //spoilFormGet
 
-var debugAutoDetect=0
+var debugAutoDetect=0;
+
 // move this part of the code here, since it's called 3 times
-function autoDetect(now,cmt) {
-    if(DEBUG) console.log('autoDetect: '+(++debugAutoDetect)+' ('+cmt+')')
-    document.querySelectorAll('form:-webkit-any([method="get" i],:not([method]))').forEach(spoilFormGet,now);
+function autoDetect(now, when_called) {
+    if(DEBUG) console.log('autoDetect: '+(++debugAutoDetect)+' ('+when_called+')');
+    document.querySelectorAll('form:-webkit-any([method="get" i],:not([method]))').forEach(spoilFormGet,{now});
     if(DEBUG) {
         console.log(`Spoiled ${numspoiled}/${numseen}.`+(unspoiled.length?'  Unspoiled were:':'') );
         if (unspoiled.length) console.log(unspoiled);
@@ -76,7 +77,8 @@ function autoDetect(now,cmt) {
     unspoiled=[];
 }
 
-function main() {   // runs on DOMContentLoaded
+function onDOMContentLoaded()
+{
 
     // OpenSearch - e.g., https://martin-thoma.com/search-engine-autodiscovery/
     // Uses CSS4 selectors, Chrome 49+
@@ -95,22 +97,20 @@ function main() {   // runs on DOMContentLoaded
         }
     );
 
-    // #1 call it now without applying the fix
-    // #2 call it in 1500 ms  and apply the fix
+    // #1 call it now (i.e., DOMContentLoaded) without applying the fix
+    // #2 call it in 1500 ms and apply the fix
     // #3 call when document loaded, and apply the fix
     // if <form> is added/modified dynamically before the document is fully loaded #1 could miss it,
     // but not #2 & #3. Note that #2 could fire after #3 if the page is fast to load.
     // Once the fix is applied, the <form> can't be found by subsequent execution of autoDetect,
     // so the fix can only be applied once (#1 is not applied but delayed until #2 or #3 fires, or if the user clicks).
 
-    window.addEventListener('load', function() { autoDetect(true,'Load'); } );
-    setTimeout(function() { autoDetect(true,'Timer'); } ,1500);
-    autoDetect(false,'onClick');
-
-} //main
+    window.addEventListener('load', function() { autoDetect(true,'Load'); } );  // #3
+    setTimeout(function() { autoDetect(true,'Timer'); } ,1500);     // #2
+    autoDetect(false,'onClick');                                    // #1
 
-var cc=0;
+} //onDOMContentLoaded
 
-document.addEventListener('DOMContentLoaded', main);
+document.addEventListener('DOMContentLoaded', onDOMContentLoaded);
 
 // vi: set ts=4 sts=4 sw=4 et ai: //

From 8c1c02e5a5937b6a8e1799486c649bc862d82cde Mon Sep 17 00:00:00 2001
From: Chris White <chrisw@leehayes.com>
Date: Mon, 24 Sep 2018 12:06:36 -0400
Subject: [PATCH 5/5] Cleanup for release; bump version number

---
 README.md         | 2 --
 src/bg.js         | 2 +-
 src/content.js    | 2 +-
 src/manifest.json | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 88c6cf7..f6210da 100644
--- a/README.md
+++ b/README.md
@@ -36,5 +36,3 @@ Additional contributors (in alphabetical order):
  - [panozzaj](https://github.com/panozzaj)
  - [Procyon-b](https://github.com/Procyon-b)
  - [rspeed](https://github.com/rspeed)
-
-
diff --git a/src/bg.js b/src/bg.js
index 7f7b04a..3835ef5 100644
--- a/src/bg.js
+++ b/src/bg.js
@@ -7,4 +7,4 @@ chrome.runtime.onMessage.addListener(
       text: '1',
       tabId: sender.tab.id
     });
-});
\ No newline at end of file
+});
diff --git a/src/content.js b/src/content.js
index 8b806c4..61f09df 100644
--- a/src/content.js
+++ b/src/content.js
@@ -1,4 +1,4 @@
-const DEBUG=true;
+const DEBUG=false;
 let numseen=0, numspoiled=0;
 let unspoiled=[];
 
diff --git a/src/manifest.json b/src/manifest.json
index e385b20..bb84a04 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
   "author": "Greg Sadetsky et al.",
   "manifest_version": 2,
   "name": "Don't add custom search engines",
-  "version": "0.0.4.1",
+  "version": "0.0.5",
   "description": "Prevent Google Chrome from auto-adding custom search engines",
   "minimum_chrome_version": "49.0.0.0",
   "offline_enabled": true,