fix of CSP violations like unsafe-eval

9 years ago · ec73147c75
5 changed files with 8 additions and 11 deletions
--- a/following.html
+++ b/following.html
@ -276,7 +276,7 @@
				@@ -276,7 +276,7 @@
        <div class="modal-header">
            <h3></h3>
            <span id="closeModal" class="modal-close cancel">&times;</span>
-            <span class="modal-back" onClick="history.back();">&lt;</span>
+            <span class="modal-back">&lt;</span>
            <span class="mark-all-as-read"></span>
        </div>
        <div class="modal-content"></div>
--- a/home.html
+++ b/home.html
@ -370,7 +370,7 @@
				@@ -370,7 +370,7 @@
        <div class="modal-header">
            <h3></h3>
            <span id="closeModal" class="modal-close cancel">&times;</span>
-            <span class="modal-back" onClick="history.back();">&lt;</span>
+            <span class="modal-back">&lt;</span>
            <span class="mark-all-as-read"></span>
        </div>
        <div class="modal-content"></div>
--- a/js/interface_common.js
+++ b/js/interface_common.js
@ -1343,6 +1343,8 @@ function initInterfaceCommon() {
				@@ -1343,6 +1343,8 @@ function initInterfaceCommon() {
        closeModal();
    });

+    $('.modal-back').on('click', function() {history.back();});
+
    $('.prompt-close').on('click', function(e) {
        e.stopPropagation();
        closeModalHandler('.prompt-wrapper');
@ -1460,6 +1462,9 @@ $(document).ready(function()
				@@ -1460,6 +1462,9 @@ $(document).ready(function()
        initInterfaceLogin();
    } else if (page.indexOf("network.html") === 0) {
        initInterfaceNetwork();
+    } else if (page.indexOf('options.html') === 0) {
+        initInterfaceCommon();
+        $.Options.initControls();
    } else if (page.indexOf("profile-edit.html") === 0) {
        initProfileEdit();
    }
--- a/js/twister_following.js
+++ b/js/twister_following.js
@ -777,7 +777,7 @@ function processSwarmProgressFinal(lastHaves, numPieces)
				@@ -777,7 +777,7 @@ function processSwarmProgressFinal(lastHaves, numPieces)
            }
        }
    }
-    window.setTimeout("requestSwarmProgress();",2000);
+    window.setTimeout(requestSwarmProgress, 2000);
 }

 function followingChangedUser() {
--- a/options.html
+++ b/options.html
@ -20,14 +20,6 @@
				@@ -20,14 +20,6 @@
    <script src="js/interface_login.js"></script>
    <script src="js/polyglot.min.js"></script>
    <script src="js/interface_localization.js"></script>
-
-    <script>
-        $(function() {
-            initInterfaceCommon();
-            $.Options.initControls();
-        })
-        changeStyle();
-    </script>
  </head>

  <body>