From 3530f2f8f64de9da13b944171f22b67e9ea80edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Sat, 21 Sep 2019 16:07:45 -0500
Subject: Fix enable noscript-spoof

---
 js/vapi-client.js |  6 ------
 js/vapi-common.js |  4 ----
 settings.html     | 20 ++++++++++----------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/js/vapi-client.js b/js/vapi-client.js
index 68da828..2532977 100644
--- a/js/vapi-client.js
+++ b/js/vapi-client.js
@@ -26,12 +26,6 @@
 'use strict';
 
 (function (self) {
-    if (self.vAPI === undefined) {
-        self.vAPI = {};
-    }
-
-    let vAPI = self.vAPI;
-
     vAPI.setTimeout = vAPI.setTimeout || function (callback, delay, extra) {
         return setTimeout(function (a) {
             callback(a);
diff --git a/js/vapi-common.js b/js/vapi-common.js
index 5304e5a..6a79096 100644
--- a/js/vapi-common.js
+++ b/js/vapi-common.js
@@ -31,10 +31,6 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 Cu.import('resource://gre/modules/Services.jsm');
 
 (function (self) {
-    if (self.vAPI === undefined) {
-        self.vAPI = vAPI;
-    }
-
     vAPI.setTimeout = vAPI.setTimeout || function (callback, delay, extra) {
         return setTimeout(function (a) {
             callback(a);
diff --git a/settings.html b/settings.html
index 80cdf81..27ee4f1 100644
--- a/settings.html
+++ b/settings.html
@@ -67,16 +67,16 @@
                         <label data-i18n="settingsCollapseBlacklisted" for="collapseBlacklisted"></label>
                     </li>
                 </ul>
-            </li>
-            <li>
-                <input id="noscriptTagsSpoofed" type="checkbox" data-matrix-switch="noscript-spoof">
-                <label data-i18n="settingsNoscriptTagsSpoofed" for="noscriptTagsSpoofed"></label>
-                <span class="whatisthis"></span>
-                <div class="whatisthis-expandable para" data-i18n="noscriptSpoofHelp"></div>
-            </li>
-            <li>
-                <input id="cloudStorageEnabled" type="checkbox" data-setting-bool>
-                <label data-i18n="settingsCloudStorageEnabled" for="cloudStorageEnabled"></label>
+                <li>
+                    <input id="noscriptTagsSpoofed" type="checkbox" data-matrix-switch="noscript-spoof">
+                    <label data-i18n="settingsNoscriptTagsSpoofed" for="noscriptTagsSpoofed"></label>
+                    <span class="whatisthis"></span>
+                    <div class="whatisthis-expandable para" data-i18n="noscriptSpoofHelp"></div>
+                </li>
+                <li>
+                    <input id="cloudStorageEnabled" type="checkbox" data-setting-bool>
+                    <label data-i18n="settingsCloudStorageEnabled" for="cloudStorageEnabled"></label>
+                </li>
             </li>
         </ul>
         <h2 data-i18n="settingsMatrixDisplayHeader"></h2>
-- 
cgit v1.2.3