diff --git a/core/modules/editor/editor.api.php b/core/modules/editor/editor.api.php
new file mode 100644
index 0000000..c4ca2cb
--- /dev/null
+++ b/core/modules/editor/editor.api.php
@@ -0,0 +1,45 @@
+' . t('About') . '';
+ $output .= '' . t('The Text Editor module provides a framework to extend the user interface on text fields that allow HTML input. Without Text Editor module, fields accept only text where formatting must be typed manually, such as entering a <strong> tag to make text bold or an <em> tag to italicize text. The Text Editor module allows these fields to be enhanced with rich text editors (WYSIWYGs) or toolbars, which make entering and formatting content easier. For more information, see the online handbook entry for Editor module.', array('@editor' => 'http://drupal.org/documentation/modules/editor/')) . '
';
+ $output .= '' . t('Uses') . '
';
+ $output .= '';
+ $output .= '- ' . t('Enabling or configuring a text editor') . '
';
+ $output .= '- ' . t('The Text Editor module does not have its own configuration page. Instead it enhances existing configuration pages with additional options. Text editors are attached to individual text formats, which can be configured on the Text formats page. Each text format may be associated with a single text editor. When entering content with that text format, the associated text editor will automatically be enabled.', array('@formats' => url('admin/config/content/formats'))) . '
';
+ $output .= '- ' . t('Allowing a user to choose a text editor') . '
';
+ $output .= '- ' . t('Because text editor configurations are bound to a text format, users with access to more than one text format may switch between available text editors by changing the text format for a field. For more information about text formats, see the Filter module help page, which describes text formats in more detail.', array('@filter' => url('admin/help/filter'))) . '
';
+ // @todo: Mention the availability of the built-in core WYSIWYG (CKEditor)
+ // when it becomes available. See http://drupal.org/node/1878344.
+ $output .= '- ' . t('Installing additional text editor libraries') . '
';
+ $output .= '- ' . t('The Text Editor module does not provide any text editor libraries itself. Most installations of Drupal include a module that provides a text editor library which may be enabled on the Modules page. Additional modules that provide text editor libraries may be downloaded from Drupal.org.', array('@modules' => url('admin/modules'), '@download' => 'http://drupal.org/search/site/wysiwyg%20module')) . '
';
+ $output .= '
';
+ return $output;
+ }
+}
+
+/**
+ * Implements hook_menu_alter().
+ *
+ * Rewrites the menu entries for filter module that relate to the configuration
+ * of text editors.
+ */
+function editor_menu_alter(&$items) {
+ $items['admin/config/content/formats']['title'] = 'Text formats and editors';
+ $items['admin/config/content/formats']['description'] = 'Configure the processing of text, including toolbars or WYSIWYG editors used on input, and allowed HTML tags and automatic formatting used on output.';
+}
+
+/**
+ * Implements hook_element_info().
+ *
+ * Extends the functionality of text_format elements (provided by Filter
+ * module), so that selecting a text format notifies a client-side text editor
+ * when it should be enabled or disabled.
+ *
+ * @see filter_element_info()
+ */
+function editor_element_info() {
+ $type['text_format'] = array(
+ '#process' => array('editor_process_format'),
+ );
+ return $type;
+}
+
+/**
+ * Implements hook_library_info().
+ */
+function editor_library_info() {
+ $path = drupal_get_path('module', 'editor');
+ $libraries['drupal.editor'] = array(
+ 'title' => 'Editor',
+ 'version' => VERSION,
+ 'js' => array(
+ $path . '/js/editor.js' => array('group' => JS_LIBRARY),
+ ),
+ 'dependencies' => array(
+ array('system', 'jquery'),
+ array('system', 'drupal'),
+ array('system', 'drupalSettings'),
+ array('system', 'jquery.once'),
+ ),
+ );
+
+ return $libraries;
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function editor_form_filter_admin_overview_alter(&$form, $form_state) {
+ // @todo Cleanup column injection: http://drupal.org/node/1876718
+ // Splice in the column for "Associated editor" into the header.
+ $position = array_search('name', $form['formats']['#header']) + 1;
+ $start = array_splice($form['formats']['#header'], 0, $position, array('editor' => t('Associated editor')));
+ $form['formats']['#header'] = array_merge($start, $form['formats']['#header']);
+
+ // Then splice in the name of each text editor for each text format.
+ $editors = drupal_container()->get('plugin.manager.editor')->getDefinitions();
+ foreach (element_children($form['formats']) as $format_id) {
+ $editor = editor_load($format_id);
+ $editor_name = ($editor && isset($editors[$editor->editor])) ? $editors[$editor->editor]['title'] : drupal_placeholder(t('None'));
+ $editor_column['editor'] = array(
+ '#type' => 'markup',
+ '#markup' => $editor_name,
+ );
+ $position = array_search('name', array_keys($form['formats'][$format_id])) + 1;
+ $start = array_splice($form['formats'][$format_id], 0, $position, $editor_column);
+ $form['formats'][$format_id] = array_merge($start, $form['formats'][$format_id]);
+ }
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function editor_form_filter_admin_format_form_alter(&$form, &$form_state) {
+ $format = $form['#format'];
+ $editor = editor_load($format->format);
+ $manager = drupal_container()->get('plugin.manager.editor');
+
+ // Check if we're switching to a different text editor and load that form.
+ if (isset($form_state['values']['editor'])) {
+ if ($form_state['values']['editor'] === '') {
+ $editor = FALSE;
+ }
+ elseif (empty($editor) || $form_state['values']['editor'] !== $editor->editor) {
+ $editor = entity_create('editor', array(
+ 'name' => $format->name,
+ 'format' => $format->format,
+ 'editor' => $form_state['values']['editor'],
+ ));
+ }
+ }
+
+ // Associate a text editor with this text format.
+ $editor_options = $manager->listOptions();
+ $form['editor'] = array(
+ '#type' => 'select',
+ '#title' => t('Editor'),
+ '#options' => $editor_options,
+ '#empty_option' => t('None'),
+ '#default_value' => $editor ? $editor->editor : '',
+ // Position the editor selection before the filter settings (weight of 0),
+ // but after the filter label and name (weight of -20).
+ '#weight' => -9,
+ '#ajax' => array(
+ 'callback' => 'editor_form_filter_admin_form_ajax',
+ 'wrapper' => 'editor-settings-wrapper',
+ ),
+ );
+
+ // If there aren't any options (other than "None") disable the select list.
+ if (empty($editor_options)) {
+ $form['editor']['#disabled'] = TRUE;
+ $form['editor']['#description'] = t('This option is disabled because no modules that provide an editor are currently enabled.');
+ }
+
+ $form['editor_settings'] = array(
+ '#tree' => TRUE,
+ '#weight' => -8,
+ '#type' => 'group',
+ '#prefix' => '',
+ '#suffix' => '
',
+ );
+
+ // Add validation per-editor validation and submit handlers.
+ if ($editor) {
+ $plugin = $manager->createInstance($editor->editor);
+ $form['editor_settings'] = array_merge($form['editor_settings'], $plugin->settingsForm($form, $form_state, $editor));
+ // Place validation first since editor validation errors should appear above
+ // individual filter validation errors.
+ array_unshift($form['#validate'], array($plugin, 'settingsFormValidate'));
+ $form['#submit'][] = array($plugin, 'settingsFormSubmit');
+ }
+
+ $form['#submit'][] = 'editor_form_filter_admin_format_submit';
+}
+
+/**
+ * AJAX submit handler for filter_admin_format_form().
+ */
+function editor_form_filter_admin_form_ajax($form, &$form_state) {
+ return $form['editor_settings'];
+}
+
+/**
+ * Additional submit handler for filter_admin_format_form().
+ */
+function editor_form_filter_admin_format_submit($form, &$form_state) {
+ $format = $form['#format'];
+ $editor = editor_load($format->format);
+
+ // Delete the existing editor if disabling or switching between editors.
+ if ($editor && $editor->editor != $form_state['values']['editor']) {
+ $editor->delete();
+ $editor = FALSE;
+ }
+
+ // Create a new editor or update the existing editor.
+ if ($form_state['values']['editor']) {
+ if (!$editor) {
+ $editor = entity_create('editor', array(
+ 'name' => $format->name,
+ 'format' => $format->format,
+ 'editor' => $form_state['values']['editor'],
+ ));
+ }
+ if (isset($form_state['values']['editor_settings'])) {
+ $editor->settings = $form_state['values']['editor_settings'];
+ }
+ $editor->save();
+ }
+}
+
+/**
+ * Loads an individual configured text editor based on format ID.
+ *
+ * @return \Drupal\editor\Plugin\Core\Entity\Editor|FALSE
+ * A text editor object, or FALSE.
+ */
+function editor_load($format_id) {
+ // Load all the editors at once here, assuming that either no editors or more
+ // than one editor will be needed on a page (such as having multiple text
+ // formats for administrators). Loading a small number of editors all at once
+ // is more efficient than loading multiple editors individually.
+ $editors = entity_load_multiple('editor');
+ return isset($editors[$format_id]) ? $editors[$format_id] : FALSE;
+}
+
+/**
+ * Additional #process callback for 'text_format' elements.
+ */
+function editor_process_format($element) {
+ global $user;
+
+ $formats = filter_formats($user);
+
+ if (!isset($element['#attached'])) {
+ $element['#attached'] = array();
+ }
+ $element['#attached'] = NestedArray::mergeDeep($element['#attached'], editor_get_attachments($formats));
+
+ return $element;
+}
+
+/**
+ * Retrieves text editor libraries and JavaScript settings.
+ *
+ * @param array $formats
+ * An array of formats as returned by filter_formats().
+ * @return array
+ * An array of library attachments, for use with #attached.
+ *
+ * @see drupal_process_attached()
+ */
+function editor_get_attachments($formats) {
+ $attachments = array();
+
+ $manager = drupal_container()->get('plugin.manager.editor');
+ $definitions = $manager->getDefinitions();
+
+ $settings = array();
+ foreach ($formats as $format_id => $format_info) {
+ $editor = editor_load($format_id);
+ if (!$editor) {
+ continue;
+ }
+
+ // Library.
+ $library = $definitions[$editor->editor]['library'];
+ $attachments['library'][] = array($library['module'], $library['name']);
+
+ // JavaScript settings.
+ $plugin = $manager->createInstance($editor->editor);
+ $settings[$format_id] = array(
+ 'editor' => $editor->editor,
+ 'editorSettings' => $plugin->generateJSSettings($editor),
+ );
+ }
+
+ // We have all JavaScript settings, allow other modules to alter them.
+ drupal_alter('editor_js_settings', $settings, $formats);
+
+ $attachments['js'][] = array(
+ 'type' => 'setting',
+ 'data' => array('editor' => array('formats' => $settings)),
+ );
+
+ return $attachments;
+}
diff --git a/core/modules/editor/js/editor.js b/core/modules/editor/js/editor.js
new file mode 100644
index 0000000..bb651c3
--- /dev/null
+++ b/core/modules/editor/js/editor.js
@@ -0,0 +1,80 @@
+/**
+ * @file
+ * Attaches behavior for the Editor module.
+ */
+
+(function ($, Drupal, drupalSettings) {
+
+"use strict";
+
+/**
+ * Initialize an empty object for editors to place their attachment code.
+ */
+Drupal.editors = {};
+
+/**
+ * Enables editors on text_format elements.
+ */
+Drupal.behaviors.editors = {
+ attach: function (context, settings) {
+ // If there are no editor settings, there are no editors to enable.
+ if (!settings.editor) {
+ return;
+ }
+
+ var $context = $(context);
+ $context.find('.filter-list:input').once('editors', function () {
+ var $this = $(this);
+ var activeEditor = $this.val();
+ var field = $this.closest('.text-format-wrapper').find('textarea').get(-1);
+
+ // Directly attach this editor, if the text format is enabled or there is
+ // only one text format at all.
+ if ($this.is(':input')) {
+ if (drupalSettings.editor.formats[activeEditor]) {
+ Drupal.editorAttach(field, drupalSettings.editor.formats[activeEditor]);
+ }
+ }
+ // Attach onChange handlers to text format selector elements.
+ if ($this.is('select')) {
+ $this.on('change.editorAttach', function () {
+ // Prevent double-binding if the change event is triggered manually.
+ if ($this.val() === activeEditor) {
+ return;
+ }
+
+ // Detach the current editor (if any) and attach a new editor.
+ if (drupalSettings.editor.formats[activeEditor]) {
+ Drupal.editorDetach(field, drupalSettings.editor.formats[activeEditor]);
+ }
+ activeEditor = $this.val();
+ if (drupalSettings.editor.formats[activeEditor]) {
+ Drupal.editorAttach(field, drupalSettings.editor.formats[activeEditor]);
+ }
+ });
+ }
+ // Detach any editor when the containing form is submitted.
+ $this.parents('form').submit(function (event) {
+ // Do not detach if the event was canceled.
+ if (event.isDefaultPrevented()) {
+ return;
+ }
+ Drupal.editorDetach(field, drupalSettings.editor.formats[activeEditor]);
+ });
+ });
+ }
+};
+
+Drupal.editorAttach = function (field, format) {
+ if (format.editor) {
+ Drupal.editors[format.editor].attach(field, format);
+ }
+};
+
+Drupal.editorDetach = function (field, format) {
+ if (format.editor) {
+ Drupal.editors[format.editor].detach(field, format);
+ }
+};
+
+})(jQuery, Drupal, drupalSettings);
diff --git a/core/modules/editor/lib/Drupal/editor/EditorBundle.php b/core/modules/editor/lib/Drupal/editor/EditorBundle.php
new file mode 100644
index 0000000..1e4b86a
--- /dev/null
+++ b/core/modules/editor/lib/Drupal/editor/EditorBundle.php
@@ -0,0 +1,27 @@
+register('plugin.manager.editor', 'Drupal\editor\Plugin\EditorManager');
+ }
+
+}
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php
new file mode 100644
index 0000000..0ed6c3a
--- /dev/null
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php
@@ -0,0 +1,79 @@
+format;
+ }
+
+ /**
+ * Overrides Drupal\Core\Entity\Entity::__construct()
+ */
+ public function __construct(array $values, $entity_type) {
+ parent::__construct($values, $entity_type);
+
+ // Initialize settings to the defaults, merging any passed in settings.
+ $manager = drupal_container()->get('plugin.manager.editor');
+ $plugin = $manager->createInstance($this->editor);
+ $this->settings = array_merge($plugin->defaultSettings(), $this->settings);
+ }
+
+}
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
new file mode 100644
index 0000000..fbba638
--- /dev/null
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
@@ -0,0 +1,82 @@
+discovery = new AnnotatedClassDiscovery('editor', 'editor');
+ $this->discovery = new AlterDecorator($this->discovery, 'editor_info');
+ $this->discovery = new CacheDecorator($this->discovery, 'editor');
+ $this->factory = new DefaultFactory($this->discovery);
+ }
+
+ /**
+ * Populate a key-value pair of available text editors.
+ *
+ * @return array
+ * An array of translated text editor labels, keyed by ID.
+ */
+ public function listOptions() {
+ $options = array();
+ foreach ($this->getDefinitions() as $key => $definition) {
+ $options[$key] = $definition['title'];
+ }
+ return $options;
+ }
+}
diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc
index a62f8e3..a53219d 100644
--- a/core/modules/filter/filter.admin.inc
+++ b/core/modules/filter/filter.admin.inc
@@ -152,6 +152,7 @@ function filter_admin_format_form($form, &$form_state, $format) {
'#title' => t('Name'),
'#default_value' => $format->name,
'#required' => TRUE,
+ '#weight' => -20,
);
$form['format'] = array(
'#type' => 'machine_name',
@@ -163,6 +164,7 @@ function filter_admin_format_form($form, &$form_state, $format) {
'source' => array('name'),
),
'#disabled' => !empty($format->format),
+ '#weight' => -19,
);
// Add user role access selection.
@@ -171,6 +173,7 @@ function filter_admin_format_form($form, &$form_state, $format) {
'#title' => t('Roles'),
'#options' => array_map('check_plain', user_roles()),
'#disabled' => $is_fallback,
+ '#weight' => -10,
);
if ($is_fallback) {
$form['roles']['#description'] = t('All roles for this text format must be enabled and cannot be changed.');