CSP no inline javascript draft

https://github.com/FreshRSS/FreshRSS/issues/1075

2 files changed, 13 insertions, 2 deletions

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 968c945c8..32a2ca913 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1245,8 +1245,19 @@ function init_configuration_alert() {
 	});
 }
 
+function parseJavaScriptCookie() {
+	var json = JSON.parse(decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1"))) || {};
+	document.cookie = 'FreshRSS-vars=; expires=Thu, 01 Jan 1970 00:00:00 GMT';
+	window.context = json.context;
+	window.shortcuts = json.shortcuts;
+	window.url = json.url;
+	window.i18n = json.i18n;
+	window.icons = json.icons;
+}
+
 function init_all() {
-	if (!(window.$ && window.context)) {
+	parseJavaScriptCookie();
+	if (!window.$) {
 		if (window.console) {
 			console.log('FreshRSS waiting for JS…');
 		}
diff --git a/p/scripts/persona.js b/p/scripts/persona.js
index 36aeeaf56..63ab43795 100644
--- a/p/scripts/persona.js
+++ b/p/scripts/persona.js
@@ -1,7 +1,7 @@
 "use strict";
 
 function init_persona() {
-	if (!(navigator.id && window.$)) {
+	if (!(navigator.id && window.$ && window.url)) {
 		if (window.console) {
 			console.log('FreshRSS (Persona) waiting for JS…');
 		}