From 46e694a5c8c7493b438bb7cccb30cbafcd883959 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Mon, 26 Nov 2018 00:14:30 +0100
Subject: [PATCH] Add script nonce when loading js for globe in sidebar

---
 plugins/Sidebar/media/Sidebar.coffee | 6 +++++-
 plugins/Sidebar/media/all.js         | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/Sidebar/media/Sidebar.coffee b/plugins/Sidebar/media/Sidebar.coffee
index 64584013..f3684e6e 100644
--- a/plugins/Sidebar/media/Sidebar.coffee
+++ b/plugins/Sidebar/media/Sidebar.coffee
@@ -564,7 +564,11 @@ class Sidebar extends Class
 		if @tag.find(".globe").hasClass("loading")
 			setTimeout (=>
 				if typeof(DAT) == "undefined"  # Globe script not loaded, do it first
-					$.getScript("/uimedia/globe/all.js", @displayGlobe)
+					script_tag = $("<script>")
+					script_tag.attr("nonce", @wrapper.script_nonce)
+					script_tag.attr("src", "/uimedia/globe/all.js")
+					script_tag.on("load", @displayGlobe)
+					document.head.appendChild(script_tag[0])
 				else
 					@displayGlobe()
 			), 600
diff --git a/plugins/Sidebar/media/all.js b/plugins/Sidebar/media/all.js
index 87c10b09..851ffe5d 100644
--- a/plugins/Sidebar/media/all.js
+++ b/plugins/Sidebar/media/all.js
@@ -1075,8 +1075,13 @@ window.initScrollable = function () {
       if (this.tag.find(".globe").hasClass("loading")) {
         return setTimeout(((function(_this) {
           return function() {
+            var script_tag;
             if (typeof DAT === "undefined") {
-              return $.getScript("/uimedia/globe/all.js", _this.displayGlobe);
+              script_tag = $("<script>");
+              script_tag.attr("nonce", _this.wrapper.script_nonce);
+              script_tag.attr("src", "/uimedia/globe/all.js");
+              script_tag.on("load", _this.displayGlobe);
+              return document.head.appendChild(script_tag[0]);
             } else {
               return _this.displayGlobe();
             }