this fixes warning/error entries in browser console

9 years ago · 535a46db37
parent b41cc1ff28
commit 535a46db37
3 changed files with 14 additions and 2 deletions
--- a/src/js/contentscript-end.js
+++ b/src/js/contentscript-end.js
@ -36,7 +36,12 @@
 // https://github.com/chrisaljoudi/uBlock/issues/464
 if ( document instanceof HTMLDocument === false ) {
    //console.debug('contentscript-end.js > not a HTLMDocument');
-    return false;
+    return;
+}
+
+// This can also happen (for example if script injected into a `data:` URI doc)
+if ( !window.location ) {
+    return;
 }

 // This can happen
--- a/src/js/contentscript-start.js
+++ b/src/js/contentscript-start.js
@ -38,6 +38,11 @@ if ( document instanceof HTMLDocument === false ) {
    return;
 }

+// This can also happen (for example if script injected into a `data:` URI doc)
+if ( !window.location ) {
+    return;
+}
+
 // This can happen
 if ( !vAPI ) {
    //console.debug('contentscript-start.js > vAPI not found');
--- a/src/js/start.js
+++ b/src/js/start.js
@ -57,7 +57,9 @@ var defaultLocalUserSettings = {
        ].join(''),
    placeholderBorder: '1px solid rgba(0, 0, 0, 0.05)',
    placeholderDocument: [
-            '<html><head><style>',
+            '<html><head>',
+            '<meta charset="utf-8">',
+            '<style>',
            'body { ',
                'background: {{bg}};',
                'color: gray;',