Commit aa62cad6 authored by Jacob Rockowitz's avatar Jacob Rockowitz
Browse files

Issue #3322552: CKEditor 5 support

parent a316886a

css/webform.element.help.css

+8 −0
Original line number Diff line number Diff line
@@ -45,3 +45,11 @@ 
.webform-element-help--content a:active {

  color: #9cf;

}



.webform-element-help--content p:first-child {

  margin-top: 0;

}



.webform-element-help--content p:last-child {

  margin-bottom: 0;

}

css/webform.element.more.css

+8 −0
Original line number Diff line number Diff line
@@ -24,3 +24,11 @@ html.js .webform-element-more--link { 
html.js .webform-element-more--content {

  display: none;

}



.webform-element-more--content p:first-child {

  margin-top: 0;

}



.webform-element-more--content p:last-child {

  margin-bottom: 0;

}

css/webform.form.css

+12 −1
Original line number Diff line number Diff line
@@ -44,6 +44,17 @@ html.js .js-webform-visually-hidden[style*="display: none"] { 
  margin-left: 0.5em;

}



/**

 * Description.

 */

.webform-element-description p:first-child {

  margin-top: 0;

}



.webform-element-description p:last-child {

  margin-bottom: 0;

}



/**

 * Container inline

 */
@@ -60,7 +71,7 @@ html.js .js-webform-visually-hidden[style*="display: none"] { 
}



/**

 * Element title inline.z

 * Element title inline.

 */

.webform-element--title-inline > label {

  display: inline;

includes/webform.editor.inc

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ function webform_filter_format_load($entities) { 
 * Implements hook_editor_js_settings_alter().

 */

function webform_editor_js_settings_alter(array &$settings) {

  $settings['editor']['formats'][WebformHtmlEditor::DEFAULT_FILTER_FORMAT]['editorSettings']['autoGrow_minHeight'] = '120';

  $settings['editor']['formats'][WebformHtmlEditor::DEFAULT_FILTER_FORMAT]['editorSettings']['autoGrow_minHeight'] = '80';

}



/* ************************************************************************** */

src/Form/AdminConfig/WebformAdminConfigElementsForm.php

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Drupal\Component\Utility\Environment; 
use Drupal\Component\Utility\Xss;

use Drupal\Core\Form\FormStateInterface;

use Drupal\file\Plugin\Field\FieldType\FileItem;

use Drupal\webform\Element\WebformHtmlEditor;

use Drupal\webform\Element\WebformMessage;

use Drupal\webform\Utility\WebformArrayHelper;

use Drupal\webform\Utility\WebformOptionsHelper;
@@ -193,7 +194,9 @@ class WebformAdminConfigElementsForm extends WebformAdminConfigBaseForm { 
    ];

    $format_options = [];

    if ($this->moduleHandler->moduleExists('filter')) {

      $format_options[WebformHtmlEditor::DEFAULT_FILTER_FORMAT] = $this->t('- Default -');

      $filters = filter_formats();

      unset($filters[WebformHtmlEditor::DEFAULT_FILTER_FORMAT]);

      foreach ($filters as $filter) {

        $format_options[$filter->id()] = $filter->label();

      }