Issue #2510104 by pwolanin, nod_, Fabianx, Wim Leers, droplet, Pere Orga: Convert drupalSettings from JavaScript to JSON, to allow for CSP in the future

2 files changed, 24 insertions, 8 deletions

diff --git a/core/misc/drupal.js b/core/misc/drupal.js
index 75f85bbacde..8ef8167b736 100644
--- a/core/misc/drupal.js
+++ b/core/misc/drupal.js
@@ -12,14 +12,6 @@
  */
 
 /**
- * Variable generated by Drupal with all the configuration created from PHP.
- *
- * @global
- *
- * @var {object} drupalSettings
- */
-
-/**
  * Variable generated by Drupal that holds all translated strings from PHP.
  *
  * @global
diff --git a/core/misc/drupalSettingsLoader.js b/core/misc/drupalSettingsLoader.js
new file mode 100644
index 00000000000..ab3911dea88
--- /dev/null
+++ b/core/misc/drupalSettingsLoader.js
@@ -0,0 +1,24 @@
+/**
+ * @file
+ * Parse inline JSON and initialize the drupalSettings global object.
+ */
+
+(function () {
+
+  "use strict";
+
+  var settingsElement = document.querySelector('script[type="application/json"][data-drupal-selector="drupal-settings-json"]');
+
+  /**
+   * Variable generated by Drupal with all the configuration created from PHP.
+   *
+   * @global
+   *
+   * @type {object}
+   */
+  window.drupalSettings = {};
+
+  if (settingsElement !== null) {
+    window.drupalSettings = JSON.parse(settingsElement.textContent);
+  }
+})();