diff --git b/core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php a/core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php index f3ea3e6..e7a5edf 100644 --- b/core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php +++ a/core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php @@ -10,7 +10,7 @@ use Drupal\Component\Annotation\Plugin; /** - * Defines an Editor annotation object. + * Defines an InPlaceEditor annotation object. * * @Annotation */ @@ -24,15 +24,8 @@ class InPlaceEditor extends Plugin { public $id; /** - * The Javascript class name associated with this plugin. - * - * @var string - */ - public $jsClassName; - - /** - * An array of editors that have registered themselves as alternatives to this - * editor. + * An array of in-place-editors that have registered themselves as + * alternatives to this editor. * * @var array */ diff --git b/core/modules/editor/editor.services.yml a/core/modules/editor/editor.services.yml index db19922..686935c 100644 --- b/core/modules/editor/editor.services.yml +++ a/core/modules/editor/editor.services.yml @@ -1,4 +1,4 @@ services: plugin.manager.editor: - class: Drupal\editor\Plugin\EditorManager + class: Drupal\editor\Plugin\InPlaceEditorManager arguments: ['@container.namespaces'] diff --git b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php index 0bd317e..0a056fb 100644 --- b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php +++ a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php @@ -17,7 +17,7 @@ * Defines the formatted text editor. * * @InPlaceEditor( - * id = "in_place_editor", + * id = "editor", * alternativeTo = {"direct"}, * module = "editor" * ) diff --git b/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php index e246c22..4ebb921 100644 --- b/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php +++ a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php @@ -133,7 +133,7 @@ function testEditorSelection() { // Editor selection w/ cardinality 1, text format w/ associated text editor. $items[0]['format'] = 'full_html'; - $this->assertEqual('in_place_editor', $this->getSelectedEditor($items, $this->field_name), "With cardinality 1, and the full_html text format, the 'editor' editor is selected."); + $this->assertEqual('editor', $this->getSelectedEditor($items, $this->field_name), "With cardinality 1, and the full_html text format, the 'editor' editor is selected."); // Editor selection with text processing, cardinality >1 $this->field_textarea_field['cardinality'] = 2; @@ -164,7 +164,7 @@ function testMetadata() { $expected = array( 'access' => TRUE, 'label' => 'Long text field', - 'editor' => 'in_place_editor', + 'editor' => 'editor', 'aria' => 'Entity entity_test 1, field Long text field', 'custom' => array( 'format' => 'full_html',