Changeset 3947:3bb644edfc18

Timestamp:

12/19/18 14:05:44 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switching from inline JS variables to JSON script. last step for dashboard page

Location:

admin

Files:

• index.php (modified) (2 diffs)
• js/_index.js (modified) (2 diffs)

admin/index.php

@@ -149 +149 @@
 # Dashboard drag'n'drop switch for its elements
 $core->auth->user_prefs->addWorkspace('accessibility');
-$dragndrop = '';
+$dragndrop      = '';
+$dragndrop_head = '';
+$dragndrop_msg  = [
+    'dragndrop_off' => __('Dashboard area\'s drag and drop is disabled'),
+    'dragndrop_on'  => __('Dashboard area\'s drag and drop is enabled')
+];
 if (!$core->auth->user_prefs->accessibility->nodragdrop) {
-    $dragndrop =
-    '<script type="text/javascript">' . "\n" .
-    dcPage::jsVar('dotclear.dragndrop_off', __('Dashboard area\'s drag and drop is disabled')) . "\n" .
-    dcPage::jsVar('dotclear.dragndrop_on', __('Dashboard area\'s drag and drop is enabled')) . "\n" .
-    "</script>\n" .
-    '<input type="checkbox" id="dragndrop" class="sr-only" title="' .
-        __('Dashboard area\'s drag and drop is disabled') . '" />' .
+    $dragndrop_head = dcPage::jsJson('dotclear_dragndrop', $dragndrop_msg);
+    $dragndrop      =
+    '<input type="checkbox" id="dragndrop" class="sr-only" title="' . $dragndrop_msg['dragndrop_off'] . '" />' .
     '<label for="dragndrop">' .
     '<svg aria-hidden="true" focusable="false" class="dragndrop-svg">' .
     '<use xlink:href="images/dragndrop.svg#mask"></use>' .
     '</svg>' .
-    '<span id="dragndrop-label" class="sr-only">' . __('Dashboard area\'s drag and drop is disabled') . '</span>' .
-    '</label>';
+    '<span id="dragndrop-label" class="sr-only">' . $dragndrop_msg['dragndrop_off'] . '</span>' .
+        '</label>';
 }
 
@@ -172 +173 @@
     dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js') .
     dcPage::jsLoad('js/_index.js') .
+    $dragndrop_head .
     $admin_post_behavior .
     # --BEHAVIOR-- adminDashboardHeaders

admin/js/_index.js

@@ -1 @@
-/*global $, dotclear, jsToolBar */
+/*global $, dotclear, jsToolBar, getData */
 'use strict';
 
@@ -249 +249 @@
     // Set or reset sortable depending on #dragndrop checbkox value
     $('#dragndrop').click(function() {
+      Object.assign(dotclear, getData('dotclear_dragndrop'));
       if ($(this).is(':checked')) {
         // Activate sorting feature