Changeset 3934:eab07f30f99b for inc/admin

Timestamp:

11/14/18 13:42:04 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Switching from inline JS variables to JSON script. CodeMirror? is on stage

File:

• inc/admin/lib.dc.page.php (modified) (1 diff)

inc/admin/lib.dc.page.php

@@ -979 +979 @@
     }
 
-    public static function jsRunCodeMirror($name, $id, $mode, $theme = '')
-    {
+    public static function jsRunCodeMirror($name, $id = null, $mode = null, $theme = '')
+    {
+        if (is_array($name)) {
+            $js = $name;
+        } else {
+            $js = [[
+                'name'  => $name,
+                'id'    => $id,
+                'mode'  => $mode,
+                'theme' => $theme
+            ]];
+        }
+
         $ret =
-            '<script type="text/javascript">' . "\n" .
-            'var ' . $name . ' = CodeMirror.fromTextArea(' . $id . ',{' . "\n" .
-            '   mode: "' . $mode . '",' . "\n" .
-            '   tabMode: "indent",' . "\n" .
-            '   lineWrapping: 1,' . "\n" .
-            '   lineNumbers: 1,' . "\n" .
-            '   matchBrackets: 1,' . "\n" .
-            '   autoCloseBrackets: 1,' . "\n" .
-            '   extraKeys: {"F11": function(cm) {cm.setOption("fullScreen",!cm.getOption("fullScreen"));}}';
-        if ($theme) {
-            $ret .=
-                ',' . "\n" .
-                '   theme: "' . $theme . '"';
-        }
-        $ret .= "\n" .
-            '});' . "\n" .
-            '</script>';
+        self::jsJson('codemirror', $js) .
+        self::jsLoad('js/codemirror.js');
         return $ret;
     }