From ef68842b801c7f8a53e086709dd8a47e3f1f7f4c Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 31 May 2015 18:11:00 -0400 Subject: [PATCH] this fixes #232 + AMO feedback re. using innerHTML --- src/js/contentscript-end.js | 29 ----------------------------- src/js/messaging.js | 10 ---------- 2 files changed, 39 deletions(-) diff --git a/src/js/contentscript-end.js b/src/js/contentscript-end.js index 7345ff5..d0c92b4 100644 --- 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 = '\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 index 83eb186..e1d2541 100644 --- 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;