this fixes #232 + AMO feedback re. using innerHTML

gorhill · May 31, 2015 · ef68842 · ef68842
1 parent 5997dec
commit ef68842
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 39 deletions.
diff --git a/src/js/contentscript-end.js b/src/js/contentscript-end.js
@@ -69,35 +69,6 @@ vAPI.shutdown.add(function() {
 /******************************************************************************/
 /******************************************************************************/
 
-// Unrendered noscript (because CSP) workaround
-
-// Executed once.
-
-(function() {
-    var checkScriptBlacklistedHandler = function(response) {
-        if ( !response.scriptBlacklisted ) {
-            return;
-        }
-        var scripts = document.querySelectorAll('noscript');
-        var i = scripts.length;
-        var realNoscript, fakeNoscript;
-        while ( i-- ) {
-            realNoscript = scripts[i];
-            fakeNoscript = document.createElement('div');
-            fakeNoscript.innerHTML = '<!-- uMatrix NOSCRIPT tag replacement: see <https://github.com/gorhill/httpswitchboard/issues/177> -->\n' + realNoscript.textContent;
-            realNoscript.parentNode.replaceChild(fakeNoscript, realNoscript);
-        }
-    };
-
-    localMessager.send({
-            what: 'checkScriptBlacklisted',
-            url: window.location.href
-    }, checkScriptBlacklistedHandler);
-})();
-
-/******************************************************************************/
-/******************************************************************************/
-
 // Executed only once.
 
 (function() {

diff --git a/src/js/messaging.js b/src/js/messaging.js
@@ -522,16 +522,6 @@ var onMessage = function(request, sender, callback) {
     var response;
 
     switch ( request.what ) {
-    case 'checkScriptBlacklisted':
-        response = {
-            scriptBlacklisted: µm.mustBlock(
-                µm.scopeFromURL(request.url),
-                µm.hostnameFromURL(request.url),
-                'script'
-            )
-        };
-        break;
-
     case 'contentScriptHasLocalStorage':
         response = contentScriptLocalStorageHandler(tabId, request.url);
         break;