Merge remote-tracking branch 'origin/temp8-tinymce' into temp8-logviewer

This commit is contained in:
Warren Buckley
2018-11-22 14:18:58 +00:00
65 changed files with 1779 additions and 6616 deletions

View File

@@ -263,24 +263,6 @@ gulp.task('dependencies', function () {
"src": ["./node_modules/clipboard/dist/clipboard.min.js"],
"base": "./node_modules/clipboard/dist"
},
{
"name": "codemirror",
"src": [
"./node_modules/codemirror/lib/codemirror.js",
"./node_modules/codemirror/lib/codemirror.css",
"./node_modules/codemirror/mode/css/css.js",
"./node_modules/codemirror/mode/javascript/javascript.js",
"./node_modules/codemirror/mode/xml/xml.js",
"./node_modules/codemirror/mode/htmlmixed/htmlmixed.js",
"./node_modules/codemirror/addon/search/*",
"./node_modules/codemirror/addon/edit/*",
"./node_modules/codemirror/addon/selection/*",
"./node_modules/codemirror/addon/dialog/*"
],
"base": "./node_modules/codemirror"
},
{
"name": "jsdiff",
"src": ["./node_modules/diff/dist/diff.min.js"],
@@ -369,6 +351,7 @@ gulp.task('dependencies', function () {
"src": [
"./node_modules/tinymce/tinymce.min.js",
"./node_modules/tinymce/plugins/**",
"./node_modules/tinymce/skins/**",
"./node_modules/tinymce/themes/**"
],
"base": "./node_modules/tinymce"