diff --git a/core/modules/ckeditor/js/ckeditor.admin.js b/core/modules/ckeditor/js/ckeditor.admin.js index 95221dc..8a32f7f 100644 --- a/core/modules/ckeditor/js/ckeditor.admin.js +++ b/core/modules/ckeditor/js/ckeditor.admin.js @@ -95,7 +95,7 @@ Drupal.ckeditor = { // The configuration for the hidden CKEditor instance that is used to build // the features metadata. hiddenEditorConfig: null, - // + // A hash, keyed by a feature name, that details CKEditor plugin features. featuresMetadata: null, // Whether the button group names are currently visible. groupNamesVisible: false, @@ -142,7 +142,7 @@ Drupal.ckeditor = { if (isDirty) { var currentConfig = this.model.get('activeEditorConfig'); - // Process the rows + // Process the rows. var rows = []; this.$el .find('.ckeditor-active-toolbar-configuration') @@ -350,7 +350,7 @@ Drupal.ckeditor = { } if (Drupal.editorConfiguration.featureIsAllowedByFilters(feature)) { - // Default toolbar buttons are in fact "added features". + // Existing toolbar buttons are in fact "added features". this.$el.find('.ckeditor-toolbar-active').trigger('CKEditorToolbarChanged', ['added', existingButtons[i]]); } else { @@ -396,7 +396,6 @@ Drupal.ckeditor = { }) // Listen for CKEditor plugin settings changes. When a plugin setting is // changed, rebuild the CKEditor features metadata. - // @todo I think this is a dead code path. .on('CKEditorPluginSettingsChanged.ckeditorAdmin', function (event, settingsChanges) { // Update hidden CKEditor configuration. for (var key in settingsChanges) { diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php index 3236690..10174b8 100644 --- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php +++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php @@ -76,9 +76,6 @@ function isEnabled(Editor $editor) { // Automatically enable this plugin if the text format associated with this // text editor uses the filter_caption filter and the DrupalImage button is // enabled. - // @todo, This parsing of the settings structure should be provided by a - // method on the CKEditor, but $editor here is not a CKEditor, it's a - // generic editor. I'm not sure how to get a reference to the CKEditor. if (isset($filters['filter_caption']) && $filters['filter_caption']->status) { $enabled = FALSE; foreach ($editor->settings['toolbar']['rows'] as $row) { diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php index 5105be2..f0e6095 100644 --- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php +++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php @@ -95,7 +95,7 @@ public function getDefaultSettings() { return array( 'toolbar' => array( 'rows' => array( - // Button groups + // Button groups. array( array( 'name' => t('Formatting'),