Commit 82cb703b authored by Jacob Rockowitz's avatar Jacob Rockowitz
Browse files

Issue #3322552: CKEditor 5 support

parent aa62cad6

modules/webform_node/tests/src/Kernel/WebformNodeUninstallTest.php

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ class WebformNodeUninstallTest extends KernelTestBase { 
   *

   * @var array

   */

  protected static $modules = ['system', 'field', 'filter', 'text', 'user', 'node', 'webform', 'webform_node'];

  protected static $modules = ['system', 'field', 'text', 'user', 'node', 'webform', 'webform_node'];



  /**

   * {@inheritdoc}

modules/webform_ui/tests/src/Functional/WebformUiElementActionsTest.php

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class WebformUiElementActionsTest extends WebformBrowserTestBase { 
   *

   * @var array

   */

  protected static $modules = ['filter', 'webform', 'webform_ui'];

  protected static $modules = ['webform', 'webform_ui'];



  /**

   * Tests actions element.

modules/webform_ui/tests/src/Functional/WebformUiElementPropertiesTest.php

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ class WebformUiElementPropertiesTest extends WebformBrowserTestBase { 
   *

   * @var array

   */

  protected static $modules = ['filter', 'file', 'taxonomy', 'webform', 'webform_ui'];

  protected static $modules = ['file', 'taxonomy', 'webform', 'webform_ui'];



  /**

   * Webforms to load.

modules/webform_ui/tests/src/Functional/WebformUiElementTest.php

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class WebformUiElementTest extends WebformBrowserTestBase { 
   *

   * @var array

   */

  protected static $modules = ['filter', 'webform', 'webform_ui', 'webform_test_element'];

  protected static $modules = [ 'webform', 'webform_ui', 'webform_test_element'];



  /**

   * Webforms to load.

src/Element/WebformHtmlEditor.php

+1 −3
Original line number Diff line number Diff line
@@ -106,9 +106,7 @@ class WebformHtmlEditor extends FormElement implements TrustedCallbackInterface 
    // If #format or 'webform.settings.html_editor.element_format' is defined return

    // a 'text_format' element.

    $format = $element['#format'] ?: \Drupal::config('webform.settings')->get('html_editor.element_format');

    if ($format

      && \Drupal::moduleHandler()->moduleExists('filter')

      && FilterFormat::load($format)) {

    if ($format && FilterFormat::load($format)) {

      $element['value'] += [

        '#type' => 'text_format',

        '#format' => $format,