Changeset 3915:a57821ba9ef1 for plugins

Timestamp:

11/05/18 16:40:40 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switching from inline JS variables to JSON script. A step ahead…

Location:

plugins

Files:

• dcCKEditor/_post_config.php (modified) (1 diff)
• dcCKEditor/inc/dc.ckeditor.behaviors.php (modified) (1 diff)
• dcLegacyEditor/inc/dc.legacy.editor.behaviors.php (modified) (1 diff)
• dcLegacyEditor/js/jsToolBar/jsToolBar.wysiwyg.js (modified) (2 diffs)

plugins/dcCKEditor/_post_config.php

@@ -256 +256 @@
 
     CKEDITOR.on('instanceReady',function(e) {
-        if (typeof dotclear_htmlFontSize !== 'undefined') {
-            e.editor.document.$.documentElement.style.setProperty('--html-font-size',dotclear_htmlFontSize);
+        if (dotclear && dotclear.data && dotclear.data.htmlFontSize) {
+            e.editor.document.$.documentElement.style.setProperty('--html-font-size',dotclear.data.htmlFontSize);
         }
 

plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php

@@ -60 +60 @@
         dcPage::jsLoad($config_js);
 
-        if ($GLOBALS['core']->auth->user_prefs->interface->htmlfontsize) {
-            $res .=
-            '<script type="text/javascript">' . "\n" .
-            dcPage::jsVar('dotclear_htmlFontSize', $GLOBALS['core']->auth->user_prefs->interface->htmlfontsize) . "\n" .
-                "</script>\n";
-        }
-
         return $res;
     }

plugins/dcLegacyEditor/inc/dc.legacy.editor.behaviors.php

@@ -139 +139 @@
             "</script>\n";
 
-        if ($GLOBALS['core']->auth->user_prefs->interface->htmlfontsize) {
-            $res .=
-            '<script type="text/javascript">' . "\n" .
-            dcPage::jsVar('dotclear_htmlFontSize', $GLOBALS['core']->auth->user_prefs->interface->htmlfontsize) . "\n" .
-                "</script>\n";
-        }
-
         return $res;
     }

plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.wysiwyg.js

@@ -1 @@
-/*global jsToolBar, dotclear_htmlFontSize, chainHandler */
+/*global jsToolBar, dotclear, chainHandler */
 'use strict';
 
@@ -184 +184 @@
     }
 
-    if (typeof dotclear_htmlFontSize !== 'undefined') {
-      doc.documentElement.style.setProperty('--html-font-size', dotclear_htmlFontSize);
+    if (dotclear && dotclear.data && dotclear.data.htmlFontSize) {
+      doc.documentElement.style.setProperty('--html-font-size', dotclear.data.htmlFontSize);
     }