Inject addEventListener hook before DOMContentLoaded on every page

Author: mrmr1993

content_scripts/inject_script.coffee

@@ -17,13 +17,25 @@ oldValue =
   else
     null
 
-# Injection method taken from method 3 of this stackoverflow answer http://stackoverflow.com/a/9517879
+firstDocumentElementChild = document.documentElement.firstElementChild
+
 for script in injectScripts
+  # Injection method taken from method 3 of this stackoverflow answer http://stackoverflow.com/a/9517879
   document.documentElement.setAttribute listenerName, fetchFileContents script
   document.documentElement.dispatchEvent new CustomEvent eventName
 
+  # Also inject as a script, so that we can still catch any addEventListener call fired at/after
+  # DOMContentLoaded.
+  scriptEl = document.createElement "script"
+  scriptEl.src = chrome.runtime.getURL injectScripts[0]
+  document.documentElement.insertBefore scriptEl, firstDocumentElementChild
+
 # Clear our event listener and restore the original, if there was one.
 if oldValue?
   document.documentElement.setAttribute listenerName, oldValue
 else
   document.documentElement.removeAttribute listenerName
+
+scriptEl = document.createElement "script"
+scriptEl.src = chrome.runtime.getURL injectScripts[0]
+document.documentElement.insertBefore scriptEl, document.documentElement.firstElementChild

pages/addEventListener_hook.coffee

@@ -1,3 +1,6 @@
+return if document.documentElement.hasAttribute("vimium-listening-for-onclick-listeners") or
+          document.documentElement.hasAttribute("vimium-listening-for-onclick-listeners-slow")
+
 _addEventListener = Element::addEventListener
 
 Element::addEventListener = (type, listener, useCapture) ->
@@ -6,4 +9,9 @@ Element::addEventListener = (type, listener, useCapture) ->
       @setAttribute "vimium-has-onclick-listener", ""
   _addEventListener.apply this, arguments
 
-document.documentElement.setAttribute "vimium-listening-for-onclick-listeners", ""
+if window.event?
+  # Executing before any page scripts.
+  document.documentElement.setAttribute "vimium-listening-for-onclick-listeners", ""
+else
+  # Executing before DOMContentLoaded, after page scripts.
+  document.documentElement.setAttribute "vimium-listening-for-onclick-listeners-slow", ""