Changeset 3919:f0be8a8c7715 for inc

Timestamp:

11/06/18 13:29:04 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switching from inline JS variables to JSON script. Includes a copy of getData() function in common.js

Location:

inc

Files:

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

inc/admin/lib.dc.page.php

@@ -172 +172 @@
         '  <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) {
@@ -449 +447 @@
         '  <meta name="GOOGLEBOT" content="NOSNIPPET" />' . "\n";
 
-        echo self::jsUtil();
-
         if ($core->auth->user_prefs->interface->darkmode) {
             $js['darkMode'] = 1;
@@ -724 +720 @@
 
         return $ret;
-    }
-
-    public static function jsUtil()
-    {
-        $core = self::getCore();
-        return self::jsLoad($core->blog->getPF('util.js'));
     }
 

inc/core/class.dc.utils.php

@@ -137 +137 @@
     public static function jsJson($id, $vars)
     {
-        // Use echo dcUtils::jsLoad($core->blog->getPF('util.js')); to use the JS getData() decoder
-        // or echo dcPage::jsUtil(); in admin mode
+        // Use echo dcUtils::jsLoad($core->blog->getPF('util.js')); to use the JS getData() decoder in public mode
         $ret = '<script type="application/json" id="' . html::escapeHTML($id) . '-data">' . "\n" .
             json_encode($vars, JSON_HEX_TAG | JSON_UNESCAPED_SLASHES) . "\n" . '</script>';