Commit 9bba2ba5 authored by Peter Weber's avatar Peter Weber Committed by Wim Leers
Browse files

Issue #3215689 by Wim Leers, tim.plunkett, zrpnr, Gábor Hojtsy: Rename... 

Issue #3215689 by Wim Leers, tim.plunkett, zrpnr, Gábor Hojtsy: Rename CKEditor 5 plugin IDs to guarantee all plugins can be made configurable
parent 9b1a917c

ckeditor5.ckeditor5.yml

+25 −25
Original line number Diff line number Diff line 
ckeditor5.essentials:

ckeditor5_essentials:

  library: ckeditor5/ckeditor5.internal

  admin_library: ckeditor5/admin.internal

  plugins: [essentials.Essentials]
@@ -9,7 +9,7 @@ ckeditor5.essentials: 
      label: Redo

  conditions: []



ckeditor5.paragraph:

ckeditor5_paragraph:

  library: ckeditor5/ckeditor5.internal

  admin_library: ckeditor5/admin.internal

  plugins: [paragraph.Paragraph]
@@ -17,7 +17,7 @@ ckeditor5.paragraph: 
    - <p>

    - <br>



ckeditor5heading:

ckeditor5_heading:

  label: Headings

  library: ckeditor5/ckeditor5.internal

  admin_library: ckeditor5/admin.heading
@@ -47,7 +47,7 @@ ckeditor5heading: 
    - <h5>

    - <h6>



ckeditor5.htmlSupport:

ckeditor5_htmlSupport:

  library: ckeditor5/ckeditor5.htmlSupport

  plugins: [htmlSupport.GeneralHtmlSupport]

  plugin_config:
@@ -62,7 +62,7 @@ ckeditor5.htmlSupport: 
  # @see \Drupal\ckeditor5\Plugin\CKEditor5PluginManager::getEnabledDefinitions()

  conditions: []



ckeditor5.sourceEditing:

ckeditor5_sourceEditing:

  library: ckeditor5/ckeditor5.sourceEditing

  admin_library: ckeditor5/admin.sourceEditing

  plugins: [sourceEditing.SourceEditing]
@@ -70,7 +70,7 @@ ckeditor5.sourceEditing: 
    sourceEditing:

      label: Source



ckeditor5.bold:

ckeditor5_bold:

  library: ckeditor5/ckeditor5.basic

  admin_library: ckeditor5/admin.basic

  plugins: [basicStyles.Bold]
@@ -80,7 +80,7 @@ ckeditor5.bold: 
  elements:

    - <strong>



ckeditor5.emphasis:

ckeditor5_emphasis:

  library: ckeditor5/drupal.ckeditor5.emphasis

  admin_library: ckeditor5/admin.basic

  plugins:
@@ -92,7 +92,7 @@ ckeditor5.emphasis: 
  elements:

    - <em>



ckeditor5.underline:

ckeditor5_underline:

  library: ckeditor5/ckeditor5.basic

  admin_library: ckeditor5/admin.basic

  plugins: [basicStyles.Underline]
@@ -102,7 +102,7 @@ ckeditor5.underline: 
  elements:

    - <u>



ckeditor5.code:

ckeditor5_code:

  library: ckeditor5/ckeditor5.basic

  admin_library: ckeditor5/admin.basic

  plugins: [basicStyles.Code]
@@ -112,7 +112,7 @@ ckeditor5.code: 
  elements:

    - <code>



ckeditor5.strikethrough:

ckeditor5_strikethrough:

  library: ckeditor5/ckeditor5.basic

  admin_library: ckeditor5/admin.basic

  plugins: [basicStyles.Strikethrough]
@@ -122,7 +122,7 @@ ckeditor5.strikethrough: 
  elements:

    - <s>



ckeditor5.subscript:

ckeditor5_subscript:

  library: ckeditor5/ckeditor5.basic

  admin_library: ckeditor5/admin.basic

  plugins: [basicStyles.Subscript]
@@ -132,7 +132,7 @@ ckeditor5.subscript: 
  elements:

    - <sub>



ckeditor5.superscript:

ckeditor5_superscript:

  library: ckeditor5/ckeditor5.basic

  admin_library: ckeditor5/admin.basic

  plugins: [basicStyles.Superscript]
@@ -142,7 +142,7 @@ ckeditor5.superscript: 
  elements:

    - <sup>



ckeditor5.blockquote:

ckeditor5_blockquote:

  library: ckeditor5/ckeditor5.blockquote

  admin_library: ckeditor5/admin.blockquote

  plugins:
@@ -163,7 +163,7 @@ ckeditor5.blockquote: 
    - <blockquote cite>

    - <cite>



ckeditor5.link:

ckeditor5_link:

  library: ckeditor5/ckeditor5.link

  admin_library: ckeditor5/admin.link

  plugins:
@@ -181,7 +181,7 @@ ckeditor5.link: 
  elements:

    - <a href hreflang>



ckeditor5.list:

ckeditor5_list:

  library: ckeditor5/ckeditor5.list

  admin_library: ckeditor5/admin.list

  plugins: [list.List]
@@ -195,7 +195,7 @@ ckeditor5.list: 
    - <ol>

    - <li>



ckeditor5.horizontalLine:

ckeditor5_horizontalLine:

  library: ckeditor5/ckeditor5.horizontalLine

  admin_library: ckeditor5/admin.horizontalLine

  plugins: [horizontalLine.HorizontalLine]
@@ -205,7 +205,7 @@ ckeditor5.horizontalLine: 
  elements:

    - <hr>



ckeditor5.alignment:

ckeditor5_alignment:

  library: ckeditor5/ckeditor5.alignment

  admin_library: ckeditor5/admin.alignment

  plugins: [alignment.Alignment]
@@ -235,7 +235,7 @@ ckeditor5.alignment: 
  elements:

    - <$block class="text-align-left text-align-center text-align-right text-align-justify">



ckeditor5.table:

ckeditor5_table:

  library: ckeditor5/ckeditor5.table

  admin_library: ckeditor5/admin.table

  plugins:
@@ -256,7 +256,7 @@ ckeditor5.table: 
    - <tbody>

    - <tfoot>



ckeditor5.image:

ckeditor5_image:

  library: ckeditor5/drupal.ckeditor5.image

  plugins:

    - image.Image
@@ -271,7 +271,7 @@ ckeditor5.image: 
    toolbarItem: uploadImage

    imageUploadStatus: true



ckeditor5.imageCaption:

ckeditor5_imageCaption:

  plugins:

    - image.ImageCaption

  plugin_config:
@@ -284,7 +284,7 @@ ckeditor5.imageCaption: 
    imageUploadStatus: true

    filter: filter_caption



ckeditor5.imageAlign:

ckeditor5_imageAlign:

  plugins:

    - image.ImageStyle

  plugin_config:
@@ -303,7 +303,7 @@ ckeditor5.imageAlign: 
    imageUploadStatus: true

    filter: filter_align



ckeditor5.indent:

ckeditor5_indent:

  library: ckeditor5/ckeditor5.indent

  admin_library: ckeditor5/admin.indent

  plugins: [indent.Indent]
@@ -313,7 +313,7 @@ ckeditor5.indent: 
    outdent:

      label: Outdent



language:

ckeditor5_language:

  label: Language

  library: ckeditor5/ckeditor5.language

  admin_library: ckeditor5/admin.language
@@ -325,7 +325,7 @@ language: 
  elements:

    - <span lang dir>



ckeditor5.media:

media_media:

  provider: media

  library: ckeditor5/drupal.ckeditor5.media

  class: \Drupal\ckeditor5\Plugin\CKEditor5Plugin\Media
@@ -343,7 +343,7 @@ ckeditor5.media: 
  conditions:

    filter: media_embed



ckeditor5.mediaLibrary:

media_library_mediaLibrary:

  admin_library: ckeditor5/admin.drupalmedia

  provider: media_library

  class: \Drupal\ckeditor5\Plugin\CKEditor5Plugin\MediaLibrary

config/schema/ckeditor5.schema.yml

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ editor.settings.ckeditor5: 
    CKEditor5EnabledConfigurablePlugins: []



# Plugin \Drupal\ckeditor5\Plugin\CKEditor5Plugin\Language

ckeditor5.plugin.language:

ckeditor5.plugin.ckeditor5_language:

  type: mapping

  label: 'Language'

  mapping:
@@ -42,7 +42,7 @@ ckeditor5.plugin.language: 
          - all



# Plugin \Drupal\ckeditor5\Plugin\CKEditor5Plugin\Heading

ckeditor5.plugin.ckeditor5heading:

ckeditor5.plugin.ckeditor5_heading:

  type: mapping

  label: Headings

  mapping:

src/AdminUi.php

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ class AdminUi { 
            if ((bool) $submitted_editor->getImageUploadSettings()['status'] !== TRUE) {

              $parents = array_merge($parents_base, [

                'plugins',

                'ckeditor5.imageUpload',

                'ckeditor5_imageUpload',

                'image_upload',

                'status',

              ]);

src/Plugin/CKEditor5Plugin/Heading.php

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class Heading extends CKEditor5PluginDefault implements CKEditor5PluginConfigura 
  public static function validChoices() : array {

    $cke5_plugin_manager = \Drupal::service('plugin.manager.ckeditor5.plugin');

    assert($cke5_plugin_manager instanceof CKEditor5PluginManager);

    $definition = $cke5_plugin_manager->getDefinition('ckeditor5heading');

    $definition = $cke5_plugin_manager->getDefinition('ckeditor5_heading');

    assert($definition['class'] === static::class);

    return array_diff(

      array_column($definition['plugin_config']['heading']['options'], 'model'),
@@ -64,14 +64,14 @@ class Heading extends CKEditor5PluginDefault implements CKEditor5PluginConfigura 
   *   A configured text editor object.

   *

   * @return string[]

   *   The values in the plugins.ckeditor5heading.enabled_headings configuration

   *   The values in the plugins.ckeditor5_heading.enabled_headings configuration

   *   plus the headings that are always enabled.

   */

  private static function getEnabledHeadings(EditorInterface $editor) : array {

    $settings = $editor->getSettings();

    return array_merge(

      self::ALWAYS_ENABLED_HEADINGS,

      $settings['plugins']['ckeditor5heading']['enabled_headings']

      $settings['plugins']['ckeditor5_heading']['enabled_headings']

    );

  }
@@ -81,7 +81,7 @@ class Heading extends CKEditor5PluginDefault implements CKEditor5PluginConfigura 
   * Form for choosing which heading tags are available.

   */

  public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {

    $configured_or_default = isset($editor->getSettings()['plugins']['ckeditor5heading']['enabled_headings'])

    $configured_or_default = isset($editor->getSettings()['plugins']['ckeditor5_heading']['enabled_headings'])

      ? static::getEnabledHeadings($editor)

      : self::DEFAULT_ENABLED_HEADINGS;

src/Plugin/CKEditor5Plugin/ImageUpload.php

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ use Drupal\editor\Entity\Editor; 
 * CKEditor5 Image plugin.

 *

 * @CKEditor5Plugin(

 *   id = "ckeditor5.imageUpload",

 *   id = "ckeditor5_imageUpload",

 *   label = @Translation("Image Upload"),

 *   admin_library = "ckeditor5/admin.imageupload",

 *   plugins = {"image.ImageUpload", "drupalImage.DrupalImageUpload"},
@@ -80,7 +80,7 @@ class ImageUpload extends CKEditor5PluginDefault implements CKEditor5PluginConfi 
      'editor',

      'settings',

      'plugins',

      'ckeditor5.imageUpload',

      'ckeditor5_imageUpload',

      'image_upload',

    ];

    $settings = $form_state->getValue($image_upload);
@@ -92,7 +92,7 @@ class ImageUpload extends CKEditor5PluginDefault implements CKEditor5PluginConfi 
      'editor',

      'settings',

      'plugins',

      'ckeditor5.imageUpload',

      'ckeditor5_imageUpload',

    ]);

  }