From 61583a65e30118944b8e34617d71d9cbd6e28a15 Mon Sep 17 00:00:00 2001 From: webchick <drupal@webchick.net> Date: Tue, 3 Nov 2015 13:28:42 -0800 Subject: [PATCH] Issue #2598070 by Wim Leers, jaxxed, DuaelFr, Haza, Reinmar, oleq: [regression] CKEditor Link button does not show if HTML filtering is enabled --- core/modules/ckeditor/js/plugins/drupalimage/plugin.js | 4 +--- core/modules/ckeditor/js/plugins/drupallink/plugin.js | 4 +--- 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 51550188df28..d2f5ef17add2 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 2707a947f34c..dfb7c875ab73 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: '' } -- GitLab