Changeset 3930:5007b8ff2be4 for admin/js/common.js

Timestamp:

11/13/18 17:14:28 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switching from inline JS variables to JSON script. Common js vars and msg

File:

• admin/js/common.js (modified) (2 diffs)

admin/js/common.js

@@ -1 @@
-/*global $, jQuery */
-/*exported chainHandler, getData */
+/*global $, jQuery, getData */
+/*exported chainHandler */
 'use strict';
-
-function getData(id, clear = true) {
-  let data = {};
-  // Read the JSON-formatted data from the DOM. (from https://mathiasbynens.be/notes/json-dom-csp)
-  // To be use with: <script type="application/json" id="myid-data">{"key":value, …}</script>
-  const element = document.getElementById(`${id}-data`);
-  if (element) {
-    try {
-      data = JSON.parse(element.textContent);
-      if (clear) {
-        // Clear the element’s contents
-        element.innerHTML = '';
-      }
-    } catch (e) {}
-  }
-  return data;
-}
 
 /* Get PreInit JSON data */
@@ -570 +553 @@
   dotclear.data = dotclear_init;
   // Get other DATA
-  Object.assign(dotclear.data, getData('dotclear'));
+  Object.assign(dotclear, getData('dotclear'));
+  Object.assign(dotclear.msg, getData('dotclear_msg'));
 
   // remove class no-js from html tag; cf style/default.css for examples