summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2015-10-17 13:10:28 (GMT)
committerAlex Pott2015-10-17 13:10:28 (GMT)
commitcea9c14b2647ff8df38bc65956aa075b8587b8c4 (patch)
treeb3bad1a18805cff81c99ef536332777f67b81d65
parentba11b094562d0f4b478ed9dd82762d6ae6ba0354 (diff)
Issue #2589779 by Jelle_S, Wim Leers: Uncaught TypeError: Cannot set property 'float' of undefined when switching text formats
-rw-r--r--core/modules/ckeditor/js/plugins/drupalimage/plugin.js2
-rw-r--r--core/modules/ckeditor/js/plugins/drupallink/plugin.js2
2 files changed, 4 insertions, 0 deletions
diff --git a/core/modules/ckeditor/js/plugins/drupalimage/plugin.js b/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
index 69d32d2..80921c2 100644
--- a/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
+++ b/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
@@ -32,6 +32,7 @@
// Override requiredContent & allowedContent.
widgetDefinition.requiredContent = new CKEDITOR.style({
element: 'img',
+ styles: {},
attributes: {
'alt': '',
'src': '',
@@ -43,6 +44,7 @@
});
var allowedContentDefinition = {
element: 'img',
+ styles: {},
attributes: {
'!data-entity-type': '',
'!data-entity-uuid': ''
diff --git a/core/modules/ckeditor/js/plugins/drupallink/plugin.js b/core/modules/ckeditor/js/plugins/drupallink/plugin.js
index 7c45bc3..e9fb555 100644
--- a/core/modules/ckeditor/js/plugins/drupallink/plugin.js
+++ b/core/modules/ckeditor/js/plugins/drupallink/plugin.js
@@ -15,6 +15,7 @@
editor.addCommand('drupallink', {
allowedContent: new CKEDITOR.style({
element: 'a',
+ styles: {},
attributes: {
'!href': '',
'target': ''
@@ -22,6 +23,7 @@
}),
requiredContent: new CKEDITOR.style({
element: 'a',
+ styles: {},
attributes: {
href: ''
}