Skip to content
Snippets Groups Projects
Commit 4f4dfa5b authored by Ide Braakman's avatar Ide Braakman Committed by Liam Morland
Browse files

Issue #3479443: Remove code related to legacy ckeditor

parent 5352b3d6
No related branches found
No related tags found
4 merge requests!540Issue #3479443: Remove code related to legacy ckeditor,!485Issue #3449523: Add option to add css class to fieldset legend element,!411#3425433 add reworked paging and getLimit,!394Prepare options element before validate
Pipeline #335651 failed
...@@ -46,11 +46,11 @@ phpcs: ...@@ -46,11 +46,11 @@ phpcs:
composer: composer:
variables: variables:
_LENIENT_ALLOW_LIST: "ckeditor, select2, styleguide" _LENIENT_ALLOW_LIST: "select2, styleguide"
composer (max PHP version): composer (max PHP version):
variables: variables:
_LENIENT_ALLOW_LIST: "ckeditor, select2, styleguide" _LENIENT_ALLOW_LIST: "select2, styleguide"
# Todo: Remove this workaround once all our dependencies are D11 compatible. # Todo: Remove this workaround once all our dependencies are D11 compatible.
phpunit: phpunit:
......
langcode: en
status: true
dependencies:
config:
- filter.format.webform_default
module:
- ckeditor
- webform
format: webform_default
editor: ckeditor
settings:
toolbar:
rows:
-
-
name: Formatting
items:
- Format
- Bold
- Italic
- Superscript
- Subscript
-
name: Media
items:
- SpecialChar
- ImceImage
-
name: Linking
items:
- DrupalLink
- DrupalUnlink
-
name: Lists
items:
- NumberedList
- BulletedList
-
name: Indentation
items:
- Outdent
- Indent
-
name: 'Block Formatting'
items:
- Blockquote
-
name: Tools
items:
- Source
- Maximize
plugins: { }
...@@ -18,7 +18,7 @@ class WebformElementHtmlEditorTest extends WebformElementBrowserTestBase { ...@@ -18,7 +18,7 @@ class WebformElementHtmlEditorTest extends WebformElementBrowserTestBase {
* *
* @var array * @var array
*/ */
protected static $modules = ['editor', 'ckeditor', 'webform']; protected static $modules = ['editor', 'webform'];
/** /**
* Webforms to load. * Webforms to load.
......
...@@ -100,8 +100,7 @@ function webform_modules_installed($modules) { ...@@ -100,8 +100,7 @@ function webform_modules_installed($modules) {
$email_provider->check(); $email_provider->check();
// Update Webform HTML editor. // Update Webform HTML editor.
if (in_array('ckeditor', $modules) if (in_array('ckeditor5', $modules)) {
|| in_array('ckeditor5', $modules)) {
\Drupal::moduleHandler()->loadInclude('webform', 'inc', 'includes/webform.install') . \Drupal::moduleHandler()->loadInclude('webform', 'inc', 'includes/webform.install') .
_webform_update_html_editor(); _webform_update_html_editor();
} }
...@@ -133,8 +132,7 @@ function webform_modules_uninstalled($modules) { ...@@ -133,8 +132,7 @@ function webform_modules_uninstalled($modules) {
$email_provider->check(); $email_provider->check();
// Update Webform HTML editor. // Update Webform HTML editor.
if (in_array('ckeditor', $modules) if (in_array('ckeditor5', $modules)) {
|| in_array('ckeditor5', $modules)) {
\Drupal::moduleHandler()->loadInclude('webform', 'inc', 'includes/webform.install') . \Drupal::moduleHandler()->loadInclude('webform', 'inc', 'includes/webform.install') .
_webform_update_html_editor(); _webform_update_html_editor();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment