Skip to content

Commit 5bf79f8

Browse files
committed
BUGFIX Removed tinymce-advcode plugin which breaks with new TinyMCE and newer browsers. Both the plugin and the underlying 'codepress' engine are unmaintained. Fall back to standard (non-highlighted) TinyMCE <textarea> editing (fixes silverstripe#6779)
1 parent 91b0c7b commit 5bf79f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1
-3113
lines changed

admin/_config.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
HtmlEditorConfig::get('cms')->enablePlugins(array('ssbuttons' => '../../../cms/javascript/tinymce_ssbuttons/editor_plugin_src.js'));
3232

3333
HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect');
34-
HtmlEditorConfig::get('cms')->insertButtonsBefore('advcode', 'ssimage', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator' );
35-
HtmlEditorConfig::get('cms')->insertButtonsAfter ('advcode', 'fullscreen', 'separator');
34+
HtmlEditorConfig::get('cms')->addButtonsToLine(2, 'ssimage', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator','code', 'fullscreen', 'separator');
3635

3736
HtmlEditorConfig::get('cms')->removeButtons('tablecontrols');
3837
HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');

forms/HtmlEditorConfig.php

-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ static function get_available_configs_map() {
9393
'table' => null,
9494
'emotions' => null,
9595
'paste' => null,
96-
'advcode' => '../../../sapphire/thirdparty/tinymce-advcode/editor_plugin_src.js',
9796
'spellchecker' => null
9897
);
9998

thirdparty/tinymce-advcode/.piston.yml

-8
This file was deleted.

thirdparty/tinymce-advcode/README

-11
This file was deleted.

thirdparty/tinymce-advcode/README.txt

-3
This file was deleted.

thirdparty/tinymce-advcode/dialog.html

-29
This file was deleted.

thirdparty/tinymce-advcode/editor_plugin.js

-41
This file was deleted.

thirdparty/tinymce-advcode/editor_plugin_src.js

-41
This file was deleted.
-578 Bytes
Binary file not shown.

thirdparty/tinymce-advcode/js/codepress/codepress.css

-21
This file was deleted.

thirdparty/tinymce-advcode/js/codepress/codepress.html

-35
This file was deleted.

thirdparty/tinymce-advcode/js/codepress/codepress.js

-138
This file was deleted.

0 commit comments

Comments
 (0)