Save CustomEvent in injected script (fixes #55)

In case the website decides to overwrite it (e.g. http://www.javamagazine.mozaicreader.com/JanFeb2016)
el1t · Aug 29, 2017 · eb2cc83 · eb2cc83
1 parent 7149f1d
commit eb2cc83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/platform/safari/client-injected.js b/platform/safari/client-injected.js
@@ -20,17 +20,18 @@
  */
 
 // __MSG_clientInjectedScript__
+var ce = CustomEvent,
+    wo = open,
+    xo = XMLHttpRequest.prototype.open,
+    img = Image,
+    linkResolver = document.createElement('a');
 var block = function(u, t) {
     if (typeof u !== 'string') return false;
     /* __MSG_eventScript__ */
     document.documentElement.setAttribute('data-ublock-blocked', '');
     document.dispatchEvent(e);
     return !!document.documentElement.getAttribute('data-ublock-blocked');
 };
-var wo = open,
-    xo = XMLHttpRequest.prototype.open,
-    img = Image,
-    linkResolver = document.createElement('a');
 Image = function() {
     var x = new img(),
         src = '';

diff --git a/platform/safari/vapi-client.js b/platform/safari/vapi-client.js
@@ -601,7 +601,7 @@ var firstMutation = function() {
         eventScript = 'var e = document.createEvent("CustomEvent");\
 e.initCustomEvent("' + vAPI.sessionId + '", false, false, {url: u, type: t});'
     } else {
-        eventScript = 'var e = new CustomEvent("' + vAPI.sessionId + '", {bubbles: false, detail: {url: u, type: t}});'
+        eventScript = 'var e = new ce("' + vAPI.sessionId + '", {bubbles: false, detail: {url: u, type: t}});'
     }
     tmpScript = tmpScript.replace('/* __MSG_eventScript__ */', eventScript);
     if ( frameId === 0 ) {