Dotclear


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • plugins/themeEditor/index.php

    r3021 r3251  
    1919$core->auth->user_prefs->addWorkspace('interface'); 
    2020$user_ui_colorsyntax = $core->auth->user_prefs->interface->colorsyntax; 
     21$user_ui_colorsyntax_theme = $core->auth->user_prefs->interface->colorsyntax_theme; 
    2122 
    2223# Loading themes 
     
    8384  <script type="text/javascript" src="<?php echo dcPage::getPF('themeEditor/script.js'); ?>"></script> 
    8485<?php if ($user_ui_colorsyntax) { ?> 
    85   <?php echo dcPage::cssLoad(dcPage::getPF('themeEditor/codemirror/codemirror.css'));?> 
    86   <?php echo dcPage::cssLoad(dcPage::getPF('themeEditor/codemirror.css'));?> 
    87   <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/codemirror.js'));?> 
    88   <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/multiplex.js'));?> 
    89   <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/xml.js'));?> 
    90   <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/javascript.js'));?> 
    91   <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/css.js'));?> 
    92   <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/php.js'));?> 
    93   <?php echo dcPage::jsLoad(dcPage::getPF('themeEditor/codemirror/htmlmixed.js'));?> 
     86     <?php echo dcPage::jsCodeMirror($user_ui_colorsyntax_theme); ?> 
    9487<?php } ?> 
    9588</head> 
     
    171164                    lineWrapping: "true", 
    172165                    lineNumbers: "true", 
    173                     matchBrackets: "true" 
     166                    matchBrackets: "true", 
     167                    autoCloseBrackets: "true"'. 
     168                    ($user_ui_colorsyntax_theme != '' ? ',theme: "'.$user_ui_colorsyntax_theme.'"' : '').' 
    174169               }); 
    175170         </script>'; 
Note: See TracChangeset for help on using the changeset viewer.

Sites map