diff --git a/core/module/config/config.php b/core/module/config/config.php index f1bb6ed..cf90bc4 100644 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -563,7 +563,7 @@ class config extends common { $this->addOutput([ 'title' => $text['core_config']['script'][0] . ucfirst($this->geturl(2)) , 'vendor' => [ - 'codemirror' + 'tinymce/plugins/codemirror/codemirror' ], 'view' => 'script', 'state' => true @@ -573,7 +573,7 @@ class config extends common { $this->addOutput([ 'title' => $text['core_config']['script'][0] . ucfirst($this->geturl(2)) , 'vendor' => [ - 'codemirror' + 'tinymce/plugins/codemirror/codemirror' ], 'view' => 'script' ]); diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index fb6a6c4..a1a402b 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -122,7 +122,7 @@ class theme extends common { $this->addOutput([ 'title' => $text['core_theme']['advanced'][1], 'vendor' => [ - 'codemirror' + 'tinymce/plugins/codemirror/codemirror' ], 'view' => 'advanced' ]); diff --git a/core/vendor/codemirror/css.inc.json b/core/vendor/codemirror/css.inc.json deleted file mode 100644 index ccae431..0000000 --- a/core/vendor/codemirror/css.inc.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "../tinymce/plugins/codemirror/codemirror/lib/codemirror.css", - "init.css" -] \ No newline at end of file diff --git a/core/vendor/codemirror/jsbody.inc.json b/core/vendor/codemirror/jsbody.inc.json deleted file mode 100644 index 0849e3c..0000000 --- a/core/vendor/codemirror/jsbody.inc.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - "../tinymce/plugins/codemirror/codemirror/lib/codemirror.js", - "../tinymce/plugins/codemirror/codemirror/mode/css/css.js", - "../tinymce/plugins/codemirror/codemirror/mode/htmlembedded/htmlembedded.js", - "../tinymce/plugins/codemirror/codemirror/mode/htmlmixed/htmlmixed.js", - "../tinymce/plugins/codemirror/codemirror/mode/javascript/javascript.js", - "../tinymce/plugins/codemirror/codemirror/mode/php/php.js", - "../tinymce/plugins/codemirror/codemirror/mode/xml/xml.js", - "init.js" -] \ No newline at end of file diff --git a/core/vendor/tinymce/plugins/codemirror/codemirror/css.inc.json b/core/vendor/tinymce/plugins/codemirror/codemirror/css.inc.json new file mode 100644 index 0000000..38b8748 --- /dev/null +++ b/core/vendor/tinymce/plugins/codemirror/codemirror/css.inc.json @@ -0,0 +1,4 @@ +[ + "lib/codemirror.css", + "init.css" +] \ No newline at end of file diff --git a/core/vendor/codemirror/init.css b/core/vendor/tinymce/plugins/codemirror/codemirror/init.css similarity index 100% rename from core/vendor/codemirror/init.css rename to core/vendor/tinymce/plugins/codemirror/codemirror/init.css diff --git a/core/vendor/codemirror/init.js b/core/vendor/tinymce/plugins/codemirror/codemirror/init.js similarity index 100% rename from core/vendor/codemirror/init.js rename to core/vendor/tinymce/plugins/codemirror/codemirror/init.js diff --git a/core/vendor/tinymce/plugins/codemirror/codemirror/jsbody.inc.json b/core/vendor/tinymce/plugins/codemirror/codemirror/jsbody.inc.json new file mode 100644 index 0000000..2bcad1c --- /dev/null +++ b/core/vendor/tinymce/plugins/codemirror/codemirror/jsbody.inc.json @@ -0,0 +1,10 @@ +[ + "lib/codemirror.js", + "mode/css/css.js", + "mode/htmlembedded/htmlembedded.js", + "mode/htmlmixed/htmlmixed.js", + "mode/javascript/javascript.js", + "mode/php/php.js", + "mode/xml/xml.js", + "init.js" +] \ No newline at end of file