Changeset 4000:f4e55f97c992 for plugins

Timestamp:

06/30/19 17:43:01 (6 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switching from inline JS variables to JSON script, widgets plugin

Location:

plugins/widgets

Files:

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

plugins/widgets/index.php

@@ -204 +204 @@
   <title><?php echo __('Widgets'); ?></title>
 <?php
-echo dcPage::cssLoad(dcPage::getPF('widgets/style.css')) .
-dcPage::jsLoad('js/jquery/jquery-ui.custom.js') .
-dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js') .
-dcPage::jsLoad(dcPage::getPF('widgets/js/widgets.js'));
-
-$core->auth->user_prefs->addWorkspace('accessibility');
-$user_dm_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop;
-if (!$user_dm_nodragdrop) {
-    echo dcPage::jsLoad(dcPage::getPF('widgets/js/dragdrop.js'));
-}
-echo dcPage::jsVars(['dotclear.msg.confirm_widgets_reset' => __('Are you sure you want to reset sidebars?')]);
-
 $widget_editor = $core->auth->getOption('editor');
 $rte_flag      = true;
@@ -222 +210 @@
     $rte_flag = $rte_flags['widgets_text'];
 }
+echo dcPage::cssLoad(dcPage::getPF('widgets/style.css')) .
+dcPage::jsLoad('js/jquery/jquery-ui.custom.js') .
+dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js') .
+dcPage::jsJson('widgets', [
+    'widget_noeditor' => ($rte_flag ? 0 : 1),
+    'msg'             => ['confirm_widgets_reset' => __('Are you sure you want to reset sidebars?')]
+]) .
+dcPage::jsLoad(dcPage::getPF('widgets/js/widgets.js'));
+
+$core->auth->user_prefs->addWorkspace('accessibility');
+$user_dm_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop;
+if (!$user_dm_nodragdrop) {
+    echo dcPage::jsLoad(dcPage::getPF('widgets/js/dragdrop.js'));
+}
 if ($rte_flag) {
-    echo dcPage::jsVars(['dotclear.widget_noeditor' => 0]);
     echo $core->callBehavior('adminPostEditor', $widget_editor['xhtml'], 'widget',
         ['#sidebarsWidgets textarea:not(.noeditor)'], 'xhtml');
-} else {
-    echo dcPage::jsVars(['dotclear.widget_noeditor' => 1]);
 }
 echo (dcPage::jsConfirmClose('sidebarsWidgets'));

plugins/widgets/js/widgets.js

@@ -1 @@
-/*global $, dotclear, jsToolBar */
+/*global $, dotclear, jsToolBar, mergeDeep, getData */
 'use strict';
 
@@ -92 +92 @@
 
 $(function() {
+
+  mergeDeep(dotclear, getData('widgets'));
+
   // reset
   $('input[name="wreset"]').click(function() {