Changeset 3256:e7ff4a1b3bc3

Timestamp:

06/17/16 15:57:23 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Implementing CodeMirror? is now a little bit more easier

Files:

• inc/admin/lib.dc.page.php (modified) (2 diffs)
• plugins/themeEditor/index.php (modified) (3 diffs)

inc/admin/lib.dc.page.php

@@ -939 +939 @@
      }
 
-     public static function jsCodeMirror($theme = '',$multi = true,$modes = array('css','htmlmixed','javascript','php','xml'))
+     public static function jsLoadCodeMirror($theme = '',$multi = true,$modes = array('css','htmlmixed','javascript','php','xml'))
      {
           $ret =
@@ -958 +958 @@
                $ret .= self::cssLoad('js/codemirror/theme/'.$theme.'.css');
           }
+          return $ret;
+     }
+
+     public static function jsRunCodeMirror($name,$id,$mode,$theme = '')
+     {
+          $ret =
+               '<script type="text/javascript">'.
+               '//<![CDATA['."\n".
+               'var '.$name.' = CodeMirror.fromTextArea('.$id.',{'."\n".
+               '    mode: "'.$mode.'",'."\n".
+               '    tabMode: "indent",'."\n".
+               '    lineWrapping: "true",'."\n".
+               '    lineNumbers: "true",'."\n".
+               '    matchBrackets: "true",'."\n".
+               '    autoCloseBrackets: "true",'."\n".
+               '    extraKeys: {"F11": function(cm) {cm.setOption("fullScreen",!cm.getOption("fullScreen"));}}';
+               if ($theme) {
+                    $ret .=
+                         ','."\n".
+                         '    theme: "'.$theme.'"';
+               }
+          $ret .=
+               "\n".'});'."\n".
+               '//]]>'.
+               '</script>';
           return $ret;
      }

plugins/themeEditor/index.php

@@ -83 +83 @@
      <script type="text/javascript" src="<?php echo dcPage::getPF('themeEditor/script.js'); ?>"></script>
      <?php if ($user_ui_colorsyntax) { ?>
-     <?php echo dcPage::jsCodeMirror($user_ui_colorsyntax_theme); ?>
+     <?php echo dcPage::jsLoadCodeMirror($user_ui_colorsyntax_theme); ?>
      <?php } ?>
      <?php echo dcPage::cssLoad(dcPage::getPF('themeEditor/style.css'));?>
@@ -144 +144 @@
                (!empty($_REQUEST['po']) ? "text/plain" : "text/html")));
           echo
-          '<script>
+          '<script type="text/javascript">
+          //<![CDATA[
                window.CodeMirror.defineMode("dotclear", function(config) {
                     return CodeMirror.multiplexingMode(
@@ -159 +160 @@
                          );
                });
-          var editor = CodeMirror.fromTextArea(document.getElementById("file_content"), {
-               mode: "dotclear",
-                    tabMode: "indent",
-                    lineWrapping: "true",
-                    lineNumbers: "true",
-                    matchBrackets: "true",
-                    autoCloseBrackets: "true",
-                    extraKeys: {
-                         "F11": function(cm) {cm.setOption("fullScreen",!cm.getOption("fullScreen"));}
-                    }'.
-                    ($user_ui_colorsyntax_theme != '' ? ',theme: "'.$user_ui_colorsyntax_theme.'"' : '').'
-               });
+          //]]>
          </script>';
+         echo dcPage::jsRunCodeMirror('editor','file_content','dotclear',$user_ui_colorsyntax_theme);
      }
 }