Changeset 3912:326f9c53acae

Timestamp:

11/03/18 09:32:26 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switching from inline JS variables to JSON script. More to come…

Location:

inc

Files:

• admin/lib.dc.page.php (modified) (3 diffs)
• core/class.dc.utils.php (modified) (1 diff)
• js/util.js (added)

inc/admin/lib.dc.page.php

@@ -166 +166 @@
         '  <meta name="viewport" content="width=device-width, initial-scale=1.0" />' . "\n" .
         '  <title>' . $title . ' - ' . html::escapeHTML($core->blog->name) . ' - ' . html::escapeHTML(DC_VENDOR_NAME) . ' - ' . DC_VERSION . '</title>' . "\n";
+
+        echo self::jsUtil();
 
         if ($core->auth->user_prefs->interface->darkmode) {
@@ -454 +456 @@
         '  <meta name="GOOGLEBOT" content="NOSNIPPET" />' . "\n";
 
+        echo self::jsUtil();
+
         if ($core->auth->user_prefs->interface->darkmode) {
             echo self::jsVars(['dotclear_darkMode' => 1]);
@@ -740 +744 @@
 
         return $ret;
+    }
+
+    public static function jsUtil()
+    {
+        return self::jsLoad($core->blog->getPF('util.js'));
     }
 

inc/core/class.dc.utils.php

@@ -133 +133 @@
     {
         return dcUtils::jsVars([$n => $v]);
+    }
+
+    public static function jsJson($id, $vars)
+    {
+        // Use dcUtils::jsLoad($core->blog->getPF('util.js')) to use the JS getData() decoder
+        $ret = '<script type="application/json" id="' . html::escapeHTML($id) . '-data">' . "\n" .
+            json_encode($vars, JSON_HEX_TAG | JSON_UNESCAPED_SLASHES) . "\n" . '</script>';
+        return $ret;
     }