diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-21 17:27:45 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-02-21 17:27:45 +0100 |
| commit | b23cafb9bbaccb62cb8eed4484a1753c2cebb936 (patch) | |
| tree | 63757ba13a0db17102523e6e74b4abe180c4c878 /p/scripts/main.js | |
| parent | 58974f55a4bdfc8aed3454762415c8e8ac9fc6a4 (diff) | |
| parent | 264d05297c72e87b114a8e930db7eae7affe5690 (diff) | |
Merge branch 'CSP-no-inline' into dev
Diffstat (limited to 'p/scripts/main.js')
| -rw-r--r-- | p/scripts/main.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/p/scripts/main.js b/p/scripts/main.js index 31b07721a..f07cdafd7 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -1245,10 +1245,10 @@ function init_configuration_alert() { }); } -function parseJavaScriptCookie() { - var vars = decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)FreshRSS-vars\s*\=\s*([^;]*).*$)|^.*$/, "$1")); - document.cookie = 'FreshRSS-vars=; expires=Thu, 01 Jan 1970 00:00:00 GMT'; - var json = JSON.parse(vars); +function parseJsonVars() { + var jsonVars = document.getElementById('jsonVars'), + json = JSON.parse(jsonVars.innerHTML); + jsonVars.outerHTML = ''; window.context = json.context; window.shortcuts = json.shortcuts; window.url = json.url; @@ -1264,7 +1264,7 @@ function init_all() { window.setTimeout(init_all, 50); return; } - parseJavaScriptCookie(); + parseJsonVars(); init_notifications(); init_confirm_action(); $stream = $('#stream'); |