Merge branch 'master' into dev10

This commit is contained in:
Fred Tempez 2020-03-14 10:32:40 +01:00
commit 321115bdc1
2 changed files with 3 additions and 1 deletions

View File

@ -28,6 +28,7 @@ tinymce.init({
path: 'codemirror', // Path to CodeMirror distribution
saveCursorPosition: false, // Insert caret marker
config: { // CodeMirror config object
/*theme: 'ambiance',*/
mode: 'application/x-httpd-php',
indentUnit: 4,
lineNumbers: true,
@ -73,6 +74,7 @@ tinymce.init({
'addon/fold/foldgutter.js'
],
cssFiles: [
/*'theme/ambiance.css',*/
'addon/dialog/dialog.css',
'addon/hint/show-hint.css',
'addon/lint/lint.css',

View File

@ -47,7 +47,7 @@ function inArray(key, arr)
indentWithTabs: true,
matchBrackets: true,
saveCursorPosition: true,
styleActiveLine: true
styleActiveLine: false
},
jsFiles: [// Default JS files
'lib/codemirror.js',