Changeset 3251:9ed815f75542 for plugins

Timestamp:

06/15/16 17:36:30 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Upgrade codemirror (from 2.35.0 to 5.15.2) and move from themeEditor plugin to admin/js

Location:

plugins/themeEditor

Files:

• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• codemirror/LICENSE (deleted)
• codemirror/codemirror.css (deleted)
• codemirror/codemirror.js (deleted)
• codemirror/css.js (deleted)
• codemirror/htmlmixed.js (deleted)
• codemirror/javascript.js (deleted)
• codemirror/multiplex.js (deleted)
• codemirror/php.js (deleted)
• codemirror/xml.js (deleted)
• index.php (modified) (3 diffs)

plugins/themeEditor/_admin.php

@@ -38 +38 @@
           try {
                $core->auth->user_prefs->interface->put('colorsyntax',!empty($_POST['colorsyntax']),'boolean');
+               $core->auth->user_prefs->interface->put('colorsyntax_theme',
+                    (!empty($_POST['colorsyntax_theme']) ? $_POST['colorsyntax_theme'] : ''));
           }
           catch (Exception $e)
@@ -50 +52 @@
           $core->auth->user_prefs->addWorkspace('interface');
 
+          $themes_list = dcPage::getCodeMirrorThemes();
+          $themes_combo = array(__('Default') => '');
+          foreach ($themes_list as $theme) {
+               $themes_combo[$theme] = $theme;
+          }
+
           echo
-          '<p><label for="colorsyntax" class="classic">'.
-          form::checkbox('colorsyntax',1,$core->auth->user_prefs->interface->colorsyntax).'</label>'.
-          __('Syntax highlighting in theme editor').
-          '</p>';
+               '<div class="fieldset two-cols clearfix">'.
+               '<h5>'.__('Syntax highlighting').'</h5>';
+          echo
+               '<div class="col">'.
+               '<p><label for="colorsyntax" class="classic">'.
+               form::checkbox('colorsyntax',1,$core->auth->user_prefs->interface->colorsyntax).'</label>'.
+               __('Syntax highlighting in theme editor').
+               '</p>';
+          if (count($themes_combo) > 1) {
+               echo
+                    '<p><label for="colorsyntax_theme" class="classic">'.__('Theme:').'</label> '.
+                    form::combo('colorsyntax_theme',$themes_combo,$core->auth->user_prefs->interface->colorsyntax_theme,
+                         '','',false,'onchange="selectTheme()"').
+                    '</p>';
+          } else {
+               echo form::hidden('colorsyntax_theme','');
+          }
+          echo '</div>';
+          echo '<div class="col">';
+          echo dcPage::jsCodeMirror('',false,array('javascript'));
+          foreach ($themes_list as $theme) {
+               echo dcPage::cssLoad('js/codemirror/theme/'.$theme.'.css');
+          }
+          echo '
+<textarea id="codemirror" name="codemirror">
+function findSequence(goal) {
+  function find(start, history) {
+    if (start == goal)
+      return history;
+    else if (start > goal)
+      return null;
+    else
+      return find(start + 5, "(" + history + " + 5)") ||
+             find(start * 3, "(" + history + " * 3)");
+  }
+  return find(1, "1");
+}</textarea>';
+          echo
+          '<script>
+               var input = document.getElementById("colorsyntax_theme");
+               var theme = input.options[input.selectedIndex].textContent;
+          var editor = CodeMirror.fromTextArea(document.getElementById("codemirror"), {
+               mode: "javascript",
+                    tabMode: "indent",
+                    lineWrapping: "true",
+                    lineNumbers: "true",
+                    matchBrackets: "true",
+                    autoCloseBrackets: "true",
+                    theme: "'.($core->auth->user_prefs->interface->colorsyntax_theme != '' ? $core->auth->user_prefs->interface->colorsyntax_theme : 'default').'"
+               });
+               function selectTheme() {
+                    var input = document.getElementById("colorsyntax_theme");
+                    var theme = input.options[input.selectedIndex].value;
+                    if (theme == "") theme = "default";
+                    editor.setOption("theme", theme);
+                    editor.refresh();
+               }
+         </script>';
+          echo '</div>';
+          echo '</div>';
      }
 }

plugins/themeEditor/_define.php

@@ -16 +16 @@
      /* Description*/         "Theme Editor",
      /* Author */             "Olivier Meunier",
-     /* Version */            '1.2',
+     /* Version */            '1.3',
      array(
           'type'         =>        'plugin'

plugins/themeEditor/index.php

@@ -19 +19 @@
 $core->auth->user_prefs->addWorkspace('interface');
 $user_ui_colorsyntax = $core->auth->user_prefs->interface->colorsyntax;
+$user_ui_colorsyntax_theme = $core->auth->user_prefs->interface->colorsyntax_theme;
 
 # Loading themes
@@ -83 +84 @@
   <script type="text/javascript" src="<?php echo dcPage::getPF('themeEditor/script.js'); ?>"></script>
 <?php if ($user_ui_colorsyntax) { ?>
-  <?php echo dcPage::cssLoad(dcPage::getPF('themeEditor/codemirror/codemirror.css'));?>
-  <?php echo dcPage::cssLoad(dcPage::getPF('themeEditor/codemirror.css'));?>
-  <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/codemirror.js'));?>
-  <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/multiplex.js'));?>
-  <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/xml.js'));?>
-  <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/javascript.js'));?>
-  <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/css.js'));?>
-  <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/php.js'));?>
-  <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/htmlmixed.js'));?>
+     <?php echo dcPage::jsCodeMirror($user_ui_colorsyntax_theme); ?>
 <?php } ?>
 </head>
@@ -171 +164 @@
                     lineWrapping: "true",
                     lineNumbers: "true",
-                    matchBrackets: "true"
+                    matchBrackets: "true",
+                    autoCloseBrackets: "true"'.
+                    ($user_ui_colorsyntax_theme != '' ? ',theme: "'.$user_ui_colorsyntax_theme.'"' : '').'
                });
          </script>';