summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2015-11-03 21:28:42 (GMT)
committerwebchick2015-11-03 21:29:51 (GMT)
commit61583a65e30118944b8e34617d71d9cbd6e28a15 (patch)
tree8a4050d990d887cacf151b868abd1bc5f1b71052
parent735dc7893e6a9196f76f77645be867083960ccbd (diff)
Issue #2598070 by Wim Leers, jaxxed, DuaelFr, Haza, Reinmar, oleq: [regression] CKEditor Link button does not show if HTML filtering is enabled
-rw-r--r--core/modules/ckeditor/js/plugins/drupalimage/plugin.js4
-rw-r--r--core/modules/ckeditor/js/plugins/drupallink/plugin.js4
2 files changed, 2 insertions, 6 deletions
diff --git a/core/modules/ckeditor/js/plugins/drupalimage/plugin.js b/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
index 5155018..d2f5ef1 100644
--- a/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
+++ b/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
@@ -47,8 +47,7 @@
'width': true,
'height': true
},
- classes: {},
- styles: {}
+ classes: {}
}
};
// Mapped from image2's requiredContent: "img[src,alt]". This does not
@@ -57,7 +56,6 @@
// @see https://www.drupal.org/node/2585173#comment-10456981
widgetDefinition.requiredContent = new CKEDITOR.style({
element: 'img',
- styles: {},
attributes: {
src: '',
alt: ''
diff --git a/core/modules/ckeditor/js/plugins/drupallink/plugin.js b/core/modules/ckeditor/js/plugins/drupallink/plugin.js
index 2707a94..dfb7c87 100644
--- a/core/modules/ckeditor/js/plugins/drupallink/plugin.js
+++ b/core/modules/ckeditor/js/plugins/drupallink/plugin.js
@@ -19,13 +19,11 @@
'!href': true,
'target': true
},
- classes: {},
- styles: {}
+ classes: {}
}
},
requiredContent: new CKEDITOR.style({
element: 'a',
- styles: {},
attributes: {
href: ''
}