getDefinitions());
$toolbar_buttons = array_unique(NestedArray::mergeDeepArray($editor->settings['toolbar']['buttons']));
$enabled_plugins = array();
+ $additional_plugins = array();
foreach ($plugins as $plugin_id) {
$plugin = $this->createInstance($plugin_id);
@@ -74,19 +75,29 @@ public function getEnabledPlugins(Editor $editor, $include_internal_plugins = FA
}
$enabled = FALSE;
+ // Enable this plugin if it provides a button that has been enabled.
if ($plugin instanceof CKEditorPluginButtonsInterface) {
$plugin_buttons = array_keys($plugin->getButtons());
$enabled = (count(array_intersect($toolbar_buttons, $plugin_buttons)) > 0);
}
+ // Otherwise enable this plugin if it declares itself as enabled.
if (!$enabled && $plugin instanceof CKEditorPluginContextualInterface) {
$enabled = $plugin->isEnabled($editor);
}
if ($enabled) {
$enabled_plugins[$plugin_id] = ($plugin->isInternal()) ? NULL : $plugin->getFile();
+ // Check if this plugin has dependencies that also need to be enabled.
+ $additional_plugins = array_merge($additional_plugins, array_diff($plugin->getDependencies($editor), $additional_plugins));
}
}
+ // Add the list of dependent plugins.
+ foreach ($additional_plugins as $plugin_id) {
+ $plugin = $this->createInstance($plugin_id);
+ $enabled_plugins[$plugin_id] = ($plugin->isInternal()) ? NULL : $plugin->getFile();
+ }
+
// Always return plugins in the same order.
asort($enabled_plugins);
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
new file mode 100644
index 0000000..84c31b2
--- /dev/null
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
@@ -0,0 +1,64 @@
+ t('Insert Image'),
+ 'drupalImage_dialogTitleEdit' => t('Edit Image'),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getButtons() {
+ return array(
+ 'DrupalImage' => array(
+ 'label' => t('Image'),
+ 'image' => drupal_get_path('module', 'ckeditor') . '/js/plugins/drupalimage/image.png',
+ ),
+ );
+ }
+
+}
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
new file mode 100644
index 0000000..a60314c
--- /dev/null
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
@@ -0,0 +1,69 @@
+ t('Add Link'),
+ 'drupalLink_dialogTitleEdit' => t('Edit Link'),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getButtons() {
+ $path = drupal_get_path('module', 'ckeditor') . '/js/plugins/drupallink';
+ return array(
+ 'DrupalLink' => array(
+ 'label' => t('Link'),
+ 'image' => $path . '/link.png',
+ ),
+ 'DrupalUnlink' => array(
+ 'label' => t('Unlink'),
+ 'image' => $path . '/unlink.png',
+ ),
+ );
+ }
+
+}
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
index 56f9a6e..dc2c308 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
@@ -46,13 +46,7 @@ public function getConfig(Editor $editor) {
$config = array(
'customConfig' => '', // Don't load CKEditor's config.js file.
'pasteFromWordPromptCleanup' => TRUE,
- 'removeDialogTabs' => 'image:Link;image:advanced;link:advanced',
'resize_dir' => 'vertical',
- 'keystrokes' => array(
- // 0x11000 is CKEDITOR.CTRL, see http://docs.ckeditor.com/#!/api/CKEDITOR-property-CTRL.
- array(0x110000 + 75, 'link'),
- array(0x110000 + 76, NULL),
- ),
);
// Add the allowedContent setting, which ensures CKEditor only allows tags
@@ -136,20 +130,6 @@ public function getButtons() {
'image_alternative' => $button('redo'),
'image_alternative_rtl' => $button('redo', 'rtl'),
),
- // "link" plugin.
- 'Link' => array(
- 'label' => t('Link'),
- 'image_alternative' => $button('link'),
- ),
- 'Unlink' => array(
- 'label' => t('Unlink'),
- 'image_alternative' => $button('unlink'),
- ),
- 'Anchor' => array(
- 'label' => t('Anchor'),
- 'image_alternative' => $button('anchor'),
- 'image_alternative_rtl' => $button('anchor', 'rtl'),
- ),
// "blockquote" plugin.
'Blockquote' => array(
'label' => t('Blockquote'),
@@ -197,11 +177,6 @@ public function getButtons() {
'label' => t('HTML block format'),
'image_alternative' => '' . t('Format') . '',
),
- // "image" plugin.
- 'Image' => array(
- 'label' => t('Image'),
- 'image_alternative' => $button('image'),
- ),
// "table" plugin.
'Table' => array(
'label' => t('Table'),
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 5ab4961..12f450a 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
@@ -25,7 +25,7 @@
class CKEditor extends EditorBase {
/**
- * Implements \Drupal\editor\Plugin\EditPluginInterface::getDefaultSettings().
+ * {@inheritdoc}
*/
public function getDefaultSettings() {
return array(
@@ -33,9 +33,9 @@ public function getDefaultSettings() {
'buttons' => array(
array(
'Bold', 'Italic',
- '|', 'Link', 'Unlink',
+ '|', 'DrupalLink', 'DrupalUnlink',
'|', 'BulletedList', 'NumberedList',
- '|', 'Blockquote', 'Image',
+ '|', 'Blockquote', 'DrupalImage',
'|', 'Source',
),
),
@@ -45,7 +45,7 @@ public function getDefaultSettings() {
}
/**
- * Implements \Drupal\editor\Plugin\EditPluginInterface::settingsForm().
+ * {@inheritdoc}
*/
public function settingsForm(array $form, array &$form_state, EditorEntity $editor) {
$module_path = drupal_get_path('module', 'ckeditor');
@@ -134,7 +134,7 @@ public function settingsForm(array $form, array &$form_state, EditorEntity $edit
}
/**
- * Implements \Drupal\editor\Plugin\EditPluginInterface::settingsFormSubmit().
+ * {@inheritdoc}
*/
public function settingsFormSubmit(array $form, array &$form_state) {
// Modify the toolbar settings by reference. The values in
@@ -151,7 +151,7 @@ public function settingsFormSubmit(array $form, array &$form_state) {
}
/**
- * Implements \Drupal\editor\Plugin\EditPluginInterface::getJSSettings().
+ * {@inheritdoc}
*/
public function getJSSettings(EditorEntity $editor) {
$language_interface = language(Language::TYPE_INTERFACE);
@@ -172,6 +172,8 @@ public function getJSSettings(EditorEntity $editor) {
'toolbar' => $this->buildToolbarJSSetting($editor),
'contentsCss' => $this->buildContentsCssJSSetting($editor),
'extraPlugins' => implode(',', array_keys($external_plugins)),
+ // @todo: Remove image and link plugins from CKEditor build.
+ 'removePlugins' => 'image,link',
'language' => $language_interface->langcode,
// Configure CKEditor to not load styles.js. The StylesCombo plugin will
// set stylesSet according to the user's settings, if the "Styles" button
@@ -192,12 +194,25 @@ public function getJSSettings(EditorEntity $editor) {
}
/**
- * Implements \Drupal\editor\Plugin\EditPluginInterface::getLibraries().
+ * {@inheritdoc}
*/
public function getLibraries(EditorEntity $editor) {
- return array(
+ $libraries = array(
array('ckeditor', 'drupal.ckeditor'),
);
+
+ // Get the required libraries for any enabled plugins.
+ $manager = drupal_container()->get('plugin.manager.ckeditor.plugin');
+ $enabled_plugins = array_keys($manager->getEnabledPlugins($editor));
+ foreach ($enabled_plugins as $plugin_id) {
+ $plugin = $manager->createInstance($plugin_id);
+ $additional_libraries = array_udiff($plugin->getLibraries($editor), $libraries, function($a, $b) {
+ return $a[0] === $b[0] && $a[1] === $b[1] ? 0 : 1;
+ });
+ $libraries = array_merge($libraries, $additional_libraries);
+ }
+
+ return $libraries;
}
/**
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
index 4d07526..68877f4 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
@@ -81,9 +81,9 @@ function testAdmin() {
'buttons' => array(
array(
'Bold', 'Italic',
- '|', 'Link', 'Unlink',
+ '|', 'DrupalLink', 'DrupalUnlink',
'|', 'BulletedList', 'NumberedList',
- '|', 'Blockquote', 'Image',
+ '|', 'Blockquote', 'DrupalImage',
'|', 'Source',
),
),
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php
index 63a816f..6805c6e 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php
@@ -100,6 +100,7 @@ function testLoading() {
$ckeditor_plugin = drupal_container()->get('plugin.manager.editor')->createInstance('ckeditor');
$editor = entity_load('editor', 'filtered_html');
$expected = array('formats' => array('filtered_html' => array(
+ 'format' => 'filtered_html',
'editor' => 'ckeditor',
'editorSettings' => $ckeditor_plugin->getJSSettings($editor),
)));
@@ -121,11 +122,11 @@ function testLoading() {
module_enable(array('ckeditor_test'));
drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
$editor->settings['toolbar']['buttons'][0][] = 'Llama';
- $editor->settings['plugins']['internal']['link_shortcut'] = 'CTRL+K';
$editor->save();
$this->drupalGet('node/add/article');
list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck();
$expected = array('formats' => array('filtered_html' => array(
+ 'format' => 'filtered_html',
'editor' => 'ckeditor',
'editorSettings' => $ckeditor_plugin->getJSSettings($editor),
)));
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorPluginManagerTest.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorPluginManagerTest.php
index 8cee06e..3d31c04 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorPluginManagerTest.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorPluginManagerTest.php
@@ -69,9 +69,13 @@ function testEnabledPlugins() {
// Case 1: no CKEditor plugins.
$definitions = array_keys($this->manager->getDefinitions());
sort($definitions);
- $this->assertIdentical(array('internal', 'stylescombo'), $definitions, 'No CKEditor plugins found besides the built-in ones.');
- $this->assertIdentical(array(), $this->manager->getEnabledPlugins($editor), 'Only built-in plugins are enabled.');
- $this->assertIdentical(array('internal' => NULL), $this->manager->getEnabledPlugins($editor, TRUE), 'Only the "internal" plugin is enabled.');
+ $this->assertIdentical(array('drupalimage', 'drupallink', 'internal', 'stylescombo'), $definitions, 'No CKEditor plugins found besides the built-in ones.');
+ $enabled_plugins = array(
+ 'drupalimage' => 'core/modules/ckeditor/js/plugins/drupalimage/plugin.js',
+ 'drupallink' => 'core/modules/ckeditor/js/plugins/drupallink/plugin.js',
+ );
+ $this->assertIdentical($enabled_plugins, $this->manager->getEnabledPlugins($editor), 'Only built-in plugins are enabled.');
+ $this->assertIdentical(array('internal' => NULL) + $enabled_plugins, $this->manager->getEnabledPlugins($editor, TRUE), 'Only the "internal" plugin is enabled.');
// Enable the CKEditor Test module, which has the Llama plugin (plus three
// variations of it, to cover all possible ways a plugin can be enabled) and
@@ -82,9 +86,9 @@ function testEnabledPlugins() {
// Case 2: CKEditor plugins are available.
$plugin_ids = array_keys($this->manager->getDefinitions());
sort($plugin_ids);
- $this->assertIdentical(array('internal', 'llama', 'llama_button', 'llama_contextual', 'llama_contextual_and_button', 'stylescombo'), $plugin_ids, 'Additional CKEditor plugins found.');
- $this->assertIdentical(array(), $this->manager->getEnabledPlugins($editor), 'Only the internal plugins are enabled.');
- $this->assertIdentical(array('internal' => NULL), $this->manager->getEnabledPlugins($editor, TRUE), 'Only the "internal" plugin is enabled.');
+ $this->assertIdentical(array('drupalimage', 'drupallink', 'internal', 'llama', 'llama_button', 'llama_contextual', 'llama_contextual_and_button', 'stylescombo'), $plugin_ids, 'Additional CKEditor plugins found.');
+ $this->assertIdentical($enabled_plugins, $this->manager->getEnabledPlugins($editor), 'Only the internal plugins are enabled.');
+ $this->assertIdentical(array('internal' => NULL) + $enabled_plugins, $this->manager->getEnabledPlugins($editor, TRUE), 'Only the "internal" plugin is enabled.');
// Case 3: enable each of the newly available plugins, if possible:
// a. Llama: cannot be enabled, since it does not implement
@@ -106,18 +110,18 @@ function testEnabledPlugins() {
$file['b'] = 'core/modules/ckeditor/tests/modules/js/llama_button.js';
$file['c'] = 'core/modules/ckeditor/tests/modules/js/llama_contextual.js';
$file['cb'] = 'core/modules/ckeditor/tests/modules/js/llama_contextual_and_button.js';
- $expected = array('llama_button' => $file['b'], 'llama_contextual_and_button' => $file['cb']);
+ $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual_and_button' => $file['cb']);
$this->assertIdentical($expected, $this->manager->getEnabledPlugins($editor), 'The LlamaButton and LlamaContextualAndButton plugins are enabled.');
$this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPlugins($editor, TRUE), 'The LlamaButton and LlamaContextualAndButton plugins are enabled.');
$editor->settings['toolbar']['buttons'][0] = $original_toolbar;
$editor->settings['toolbar']['buttons'][0][] = 'Strike';
$editor->save();
- $expected = array('llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
+ $expected = $enabled_plugins + array('llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
$this->assertIdentical($expected, $this->manager->getEnabledPlugins($editor), 'The LLamaContextual and LlamaContextualAndButton plugins are enabled.');
$this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPlugins($editor, TRUE), 'The LlamaContextual and LlamaContextualAndButton plugins are enabled.');
$editor->settings['toolbar']['buttons'][0][] = 'Llama';
$editor->save();
- $expected = array('llama_button' => $file['b'], 'llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
+ $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
$this->assertIdentical($expected, $this->manager->getEnabledPlugins($editor), 'The LlamaButton, LlamaContextual and LlamaContextualAndButton plugins are enabled.');
$this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPlugins($editor, TRUE), 'The LLamaButton, LlamaContextual and LlamaContextualAndButton plugins are enabled.');
}
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php
index 971d12e..978ba4a 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php
@@ -79,13 +79,21 @@ function testGetJSSettings() {
// Default toolbar.
$expected_config = $this->getDefaultInternalConfig() + array(
+ 'drupalImage_dialogTitleAdd' => 'Insert Image',
+ 'drupalImage_dialogTitleEdit' => 'Edit Image',
+ 'drupalLink_dialogTitleAdd' => 'Add Link',
+ 'drupalLink_dialogTitleEdit' => 'Edit Link',
'allowedContent' => $this->getDefaultAllowedContentConfig(),
'toolbar' => $this->getDefaultToolbarConfig(),
'contentsCss' => $this->getDefaultContentsCssConfig(),
- 'extraPlugins' => '',
+ 'extraPlugins' => 'drupalimage,drupallink',
+ 'removePlugins' => 'image,link',
'language' => 'en',
'stylesSet' => FALSE,
- 'drupalExternalPlugins' => array(),
+ 'drupalExternalPlugins' => array(
+ 'drupalimage' => file_create_url('core/modules/ckeditor/js/plugins/drupalimage/plugin.js'),
+ 'drupallink' => file_create_url('core/modules/ckeditor/js/plugins/drupallink/plugin.js'),
+ ),
);
ksort($expected_config);
$this->assertIdentical($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for default configuration.');
@@ -96,17 +104,16 @@ function testGetJSSettings() {
drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
$editor->settings['toolbar']['buttons'][0][] = 'Strike';
$editor->settings['toolbar']['buttons'][1][] = 'Format';
- $editor->settings['plugins']['internal']['link_shortcut'] = 'CTRL+K';
$editor->save();
$expected_config['toolbar'][count($expected_config['toolbar'])-2]['items'][] = 'Strike';
$expected_config['toolbar'][]['items'][] = 'Format';
$expected_config['toolbar'][] = '/';
$expected_config['format_tags'] = 'p;h4;h5;h6';
- $expected_config['extraPlugins'] = 'llama_contextual,llama_contextual_and_button';
+ $expected_config['extraPlugins'] .= ',llama_contextual,llama_contextual_and_button';
+ $expected_config['removePlugins'] = 'image,link';
$expected_config['drupalExternalPlugins']['llama_contextual'] = file_create_url('core/modules/ckeditor/tests/modules/js/llama_contextual.js');
$expected_config['drupalExternalPlugins']['llama_contextual_and_button'] = file_create_url('core/modules/ckeditor/tests/modules/js/llama_contextual_and_button.js');
$expected_config['contentsCss'][] = file_create_url('core/modules/ckeditor/tests/modules/ckeditor_test.css');
- $expected_config['keystrokes'] = array(array(1114187, 'link'), array(1114188, NULL));
ksort($expected_config);
$this->assertIdentical($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.');
@@ -302,9 +309,7 @@ protected function getDefaultInternalConfig() {
return array(
'customConfig' => '',
'pasteFromWordPromptCleanup' => TRUE,
- 'removeDialogTabs' => 'image:Link;image:advanced;link:advanced',
'resize_dir' => 'vertical',
- 'keystrokes' => array(array(0x110000 + 75, 'link'), array(0x110000 + 76, NULL)),
);
}
@@ -323,9 +328,9 @@ protected function getDefaultAllowedContentConfig() {
protected function getDefaultToolbarConfig() {
return array(
0 => array('items' => array('Bold', 'Italic')),
- 1 => array('items' => array('Link', 'Unlink')),
+ 1 => array('items' => array('DrupalLink', 'DrupalUnlink')),
2 => array('items' => array('BulletedList', 'NumberedList')),
- 3 => array('items' => array('Blockquote', 'Image')),
+ 3 => array('items' => array('Blockquote', 'DrupalImage')),
4 => array('items' => array('Source')),
5 => '/'
);
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
index 0fd3adf..f8c7443 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
@@ -33,6 +33,20 @@
class Llama extends PluginBase implements CKEditorPluginInterface {
/**
+ * Implements \Drupal\ckeditor\Plugin\CKEditorPluginInterface::getDependencies().
+ */
+ function getDependencies(Editor $editor) {
+ return array();
+ }
+
+ /**
+ * Implements \Drupal\ckeditor\Plugin\CKEditorPluginInterface::getLibraries().
+ */
+ function getLibraries(Editor $editor) {
+ return array();
+ }
+
+ /**
* Implements \Drupal\ckeditor\Plugin\CKEditorPluginInterface::isInternal().
*/
function isInternal() {
@@ -47,7 +61,7 @@ function getFile() {
}
/**
- * Implements \Drupal\ckeditor\Plugin\CKEditorPluginInterface::getButtons().
+ * Implements \Drupal\ckeditor\Plugin\CKEditorPluginInterface::getConfig().
*/
public function getConfig(Editor $editor) {
return array();
diff --git a/core/modules/editor/css/editor.css b/core/modules/editor/css/editor.css
new file mode 100644
index 0000000..e8a9d9e
--- /dev/null
+++ b/core/modules/editor/css/editor.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ * Styles for text editors.
+ */
+.editor-dialog {
+ /* This !important is required to override inline CSS of jQuery UI. */
+ width: 80% !important;
+ max-width: 500px;
+}
+
+@media screen and (max-width: 600px) {
+ .editor-dialog {
+ width: 95% !important;
+ }
+}
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index a0e78a6..687a47a 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -83,6 +83,9 @@ function editor_library_info() {
'js' => array(
$path . '/js/editor.js' => array(),
),
+ 'css' => array(
+ $path . '/css/editor.css' => array(),
+ ),
'dependencies' => array(
array('system', 'jquery'),
array('system', 'drupal'),
@@ -91,6 +94,20 @@ function editor_library_info() {
),
);
+ $libraries['drupal.editor.dialog'] = array(
+ 'title' => 'Text Editor Dialog',
+ 'version' => VERSION,
+ 'js' => array(
+ $path . '/js/editor.dialog.js' => array('weight' => 2),
+ ),
+ 'dependencies' => array(
+ array('system', 'jquery'),
+ array('system', 'drupal.dialog'),
+ array('system', 'drupal.ajax'),
+ array('system', 'drupalSettings'),
+ ),
+ );
+
$libraries['edit.formattedTextEditor.editor'] = array(
'title' => 'Formatted text editor',
'version' => VERSION,
diff --git a/core/modules/editor/editor.routing.yml b/core/modules/editor/editor.routing.yml
index 0bb56cf..f4ae496 100644
--- a/core/modules/editor/editor.routing.yml
+++ b/core/modules/editor/editor.routing.yml
@@ -5,3 +5,15 @@ editor_field_untransformed_text:
requirements:
_permission: 'access in-place editing'
_access_edit_entity_field: 'TRUE'
+editor_image_dialog:
+ pattern: '/editor/dialog/image/{filter_format}'
+ defaults:
+ _form: '\Drupal\editor\Form\EditorImageDialog'
+ requirements:
+ _filter_access: 'TRUE'
+editor_link_dialog:
+ pattern: '/editor/dialog/link/{filter_format}'
+ defaults:
+ _form: '\Drupal\editor\Form\EditorLinkDialog'
+ requirements:
+ _filter_access: 'TRUE'
diff --git a/core/modules/editor/js/editor.dialog.js b/core/modules/editor/js/editor.dialog.js
new file mode 100644
index 0000000..35dd4be
--- /dev/null
+++ b/core/modules/editor/js/editor.dialog.js
@@ -0,0 +1,21 @@
+/**
+ * AJAX commands used by Editor module.
+ */
+
+(function ($, Drupal) {
+
+"use strict";
+
+/**
+ * Command to save the contents of an editor-provided modal.
+ *
+ * This command does not close the open modal. It should be followed by a call
+ * to Drupal.AjaxCommands.prototype.closeDialog. Editors that are integrated
+ * with dialogs must independently listen for an editor:dialogsave event to save
+ * the changes into the contents of their interface.
+ */
+Drupal.AjaxCommands.prototype.editorDialogSave = function (ajax, response, status) {
+ $(window).trigger('editor:dialogsave', [response.values]);
+};
+
+})(jQuery, Drupal);
diff --git a/core/modules/editor/lib/Drupal/editor/Ajax/EditorDialogSave.php b/core/modules/editor/lib/Drupal/editor/Ajax/EditorDialogSave.php
new file mode 100644
index 0000000..a340762
--- /dev/null
+++ b/core/modules/editor/lib/Drupal/editor/Ajax/EditorDialogSave.php
@@ -0,0 +1,47 @@
+values = $values;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function render() {
+ return array(
+ 'command' => 'editorDialogSave',
+ 'values' => $this->values,
+ );
+ }
+
+}
diff --git a/core/modules/editor/lib/Drupal/editor/EditorController.php b/core/modules/editor/lib/Drupal/editor/EditorController.php
index 2968454..93bbe52 100644
--- a/core/modules/editor/lib/Drupal/editor/EditorController.php
+++ b/core/modules/editor/lib/Drupal/editor/EditorController.php
@@ -9,8 +9,13 @@
use Symfony\Component\DependencyInjection\ContainerAware;
use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Ajax\OpenModalDialogCommand;
+use Drupal\Core\Ajax\CloseModalDialogCommand;
use Drupal\Core\Entity\EntityInterface;
use Drupal\editor\Ajax\GetUntransformedTextCommand;
+use Drupal\editor\Form\EditorImageDialog;
+use Drupal\editor\Form\EditorLinkDialog;
+use Drupal\filter\Plugin\Core\Entity\FilterFormat;
/**
* Returns responses for Editor module routes.
diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php b/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
new file mode 100644
index 0000000..0a913bd
--- /dev/null
+++ b/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
@@ -0,0 +1,136 @@
+';
+ $form['#suffix'] = '';
+
+ // Everything under the "attributes" key is merged directly into the
+ // generated img tag's attributes.
+ $form['attributes']['src'] = array(
+ '#title' => t('URL'),
+ '#type' => 'textfield',
+ '#default_value' => isset($input['src']) ? $input['src'] : '',
+ '#maxlength' => 2048,
+ '#required' => TRUE,
+ );
+
+ $form['attributes']['alt'] = array(
+ '#title' => t('Alternative text'),
+ '#type' => 'textfield',
+ '#default_value' => isset($input['alt']) ? $input['alt'] : '',
+ '#maxlength' => 2048,
+ );
+ $form['dimensions'] = array(
+ '#type' => 'item',
+ '#title' => t('Image size'),
+ '#field_prefix' => '',
+ '#field_suffix' => '
',
+ );
+ $form['dimensions']['width'] = array(
+ '#title' => t('Width'),
+ '#title_display' => 'invisible',
+ '#type' => 'number',
+ '#default_value' => isset($input['width']) ? $input['width'] : '',
+ '#size' => 8,
+ '#maxlength' => 8,
+ '#min' => 1,
+ '#max' => 99999,
+ '#placeholder' => 'width',
+ '#field_suffix' => ' x ',
+ '#parents' => array('attributes', 'width'),
+ );
+ $form['dimensions']['height'] = array(
+ '#title' => t('Height'),
+ '#title_display' => 'invisible',
+ '#type' => 'number',
+ '#default_value' => isset($input['height']) ? $input['height'] : '',
+ '#size' => 8,
+ '#maxlength' => 8,
+ '#min' => 1,
+ '#max' => 99999,
+ '#placeholder' => 'height',
+ '#field_suffix' => 'pixels',
+ '#parents' => array('attributes', 'height'),
+ );
+
+ $form['actions'] = array(
+ '#type' => 'actions',
+ );
+ $form['actions']['save_modal'] = array(
+ '#type' => 'submit',
+ '#value' => t('Save'),
+ // No regular submit-handler. This form only works via JavaScript.
+ '#submit' => array(),
+ '#ajax' => array(
+ 'callback' => array($this, 'submitForm'),
+ ),
+ );
+
+ return $form;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validateForm(array &$form, array &$form_state) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function submitForm(array &$form, array &$form_state) {
+ $response = new AjaxResponse();
+
+ if (form_get_errors()) {
+ unset($form['#prefix'], $form['#suffix']);
+ $output = drupal_render($form);
+ $output = '' . theme('status_messages') . $output . '
';
+ $response->addCommand(new HtmlCommand('#editor-image-dialog-form', $output));
+ }
+ else {
+ $response->addCommand(new EditorDialogSave($form_state['values']));
+ $response->addCommand(new CloseModalDialogCommand());
+ }
+
+ return $response;
+ }
+
+}
diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php b/core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php
new file mode 100644
index 0000000..ce2b5c7
--- /dev/null
+++ b/core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php
@@ -0,0 +1,103 @@
+';
+ $form['#suffix'] = '';
+
+ // Everything under the "attributes" key is merged directly into the
+ // generated link tag's attributes.
+ $form['attributes']['href'] = array(
+ '#title' => t('URL'),
+ '#type' => 'textfield',
+ '#default_value' => isset($input['href']) ? $input['href'] : '',
+ '#maxlength' => 2048,
+ );
+
+ $form['attributes']['target'] = array(
+ '#title' => t('Open in new window'),
+ '#type' => 'checkbox',
+ '#default_value' => !empty($input['target']),
+ '#return_value' => '_blank',
+ );
+
+ $form['actions'] = array(
+ '#type' => 'actions',
+ );
+ $form['actions']['save_modal'] = array(
+ '#type' => 'submit',
+ '#value' => t('Save'),
+ // No regular submit-handler. This form only works via JavaScript.
+ '#submit' => array(),
+ '#ajax' => array(
+ 'callback' => array($this, 'submitForm'),
+ ),
+ );
+
+ return $form;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validateForm(array &$form, array &$form_state) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function submitForm(array &$form, array &$form_state) {
+ $response = new AjaxResponse();
+
+ if (form_get_errors()) {
+ unset($form['#prefix'], $form['#suffix']);
+ $output = drupal_render($form);
+ $output = '' . theme('status_messages') . $output . '
';
+ $response->addCommand(new HtmlCommand('#editor-link-dialog-form', $output));
+ }
+ else {
+ $response->addCommand(new EditorDialogSave($form_state['values']));
+ $response->addCommand(new CloseModalDialogCommand());
+ }
+
+ return $response;
+ }
+
+}
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
index 4014d0c..585b19f 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
@@ -76,6 +76,7 @@ public function getAttachments(array $format_ids) {
// JavaScript settings.
$settings[$format_id] = array(
+ 'format' => $format_id,
'editor' => $editor->editor,
'editorSettings' => $plugin->getJSSettings($editor),
);
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php b/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php
index c0731cc..8de3610 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php
@@ -93,6 +93,7 @@ function testLoading() {
$this->drupalGet('node/add/article');
list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck();
$expected = array('formats' => array('full_html' => array(
+ 'format' => 'full_html',
'editor' => 'unicorn',
'editorSettings' => array('ponyModeEnabled' => TRUE),
)));
@@ -119,6 +120,7 @@ function testLoading() {
$this->drupalGet('node/add/article');
list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck();
$expected = array('formats' => array('plain_text' => array(
+ 'format' => 'plain_text',
'editor' => 'unicorn',
'editorSettings' => array('ponyModeEnabled' => TRUE),
)));
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php b/core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php
index cc8e3c0..729c93b 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php
@@ -102,6 +102,7 @@ function testManager() {
'type' => 'setting',
'data' => array('editor' => array('formats' => array(
'full_html' => array(
+ 'format' => 'full_html',
'editor' => 'unicorn',
'editorSettings' => $unicorn_plugin->getJSSettings($editor),
)
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 7a1b8d4..ab9ac56 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1234,9 +1234,13 @@ function system_library_info() {
'js' => array(
'core/misc/dialog.js' => array('group' => JS_LIBRARY),
),
+ 'css' => array(
+ 'core/misc/dialog.theme.css' => array('weight' => 1),
+ ),
'dependencies' => array(
array('system', 'jquery'),
array('system', 'drupal'),
+ array('system', 'drupal.debounce'),
array('system', 'drupalSettings'),
array('system', 'jquery.ui.dialog')
),
diff --git a/core/profiles/standard/config/editor.editor.basic_html.yml b/core/profiles/standard/config/editor.editor.basic_html.yml
index e66cc2e..cf4a600 100644
--- a/core/profiles/standard/config/editor.editor.basic_html.yml
+++ b/core/profiles/standard/config/editor.editor.basic_html.yml
@@ -7,14 +7,14 @@ settings:
- Bold
- Italic
- '|'
- - Link
- - Unlink
+ - DrupalLink
+ - DrupalUnlink
- '|'
- BulletedList
- NumberedList
- '|'
- Blockquote
- - Image
+ - DrupalImage
- '|'
- Source
plugins:
diff --git a/core/profiles/standard/config/editor.editor.full_html.yml b/core/profiles/standard/config/editor.editor.full_html.yml
index 378cc45..c0111f9 100644
--- a/core/profiles/standard/config/editor.editor.full_html.yml
+++ b/core/profiles/standard/config/editor.editor.full_html.yml
@@ -12,14 +12,14 @@ settings:
- -
- RemoveFormat
- '|'
- - Link
- - Unlink
+ - DrupalLink
+ - DrupalUnlink
- '|'
- BulletedList
- NumberedList
- '|'
- Blockquote
- - Image
+ - DrupalImage
- Table
- HorizontalRule
- '|'
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index a7a36a8..9a05bb1 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -109,7 +109,7 @@ pre {
body,
#site-slogan,
-.ui-widget,
+#page .ui-widget,
.comment-form label,
.node-form label,
.node-form .description {
diff --git a/core/themes/seven/jquery.ui.theme.css b/core/themes/seven/jquery.ui.theme.css
index ee72497..4a171fb 100644
--- a/core/themes/seven/jquery.ui.theme.css
+++ b/core/themes/seven/jquery.ui.theme.css
@@ -330,55 +330,6 @@
opacity: .70;
filter: Alpha(Opacity=70);
}
-
-/**
- * Dialogs
- */
-.ui-dialog {
- background: #fff;
- border: solid 1px #ccc;
- padding: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
- font-weight: bold;
- background: #e1e2dc;
-}
-.ui-dialog .ui-dialog-buttonpane {
- border-width: 0;
-}
-.ui-dialog .ui-dialog-buttonpane button {
- cursor: pointer;
- padding: 4px 17px;
- color: #5a5a5a;
- text-align: center;
- font-family: "Lucida Grande", Verdana, sans-serif;
- font-weight: normal;
- font-size: 1em;
- border: 1px solid #e4e4e4;
- border-bottom: 1px solid #b4b4b4;
- border-left-color: #D2D2D2;
- border-right-color: #D2D2D2;
- background: url(images/buttons.png) 0 0 repeat-x;
- border-radius: 20px;
-}
-.ui-dialog .ui-dialog-buttonpane button:hover,
-.ui-dialog .ui-dialog-buttonpane button:focus {
- background-position: 0 -40px;
- border: 1px solid #bebebe;
- border-left-color: #afafaf;
- border-right-color: #afafaf;
- border-bottom-color: #9b9b9b;
- color: #2e2e2e;
-}
-.ui-dialog .ui-dialog-buttonpane button:active {
- background-position: 0 -80px;
- border: 1px solid #333;
- border-left-color: #222;
- border-right-color: #222;
- border-bottom-color: #111;
- color: #fff;
- text-shadow: #222 0px -1px 0px;
-}
.overlay {
padding-right: 26px;
}