Issue backdrop#101: Minor fixing to removing classes. Adding default …

…margins to floated images.
kiamlaluno · Aug 4, 2015 · db0dfd3 · db0dfd3
1 parent 339cbbe
commit db0dfd3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/core/modules/ckeditor5/core/modules/ckeditor/css/ckeditor-iframe.css b/core/modules/ckeditor5/core/modules/ckeditor/css/ckeditor-iframe.css
@@ -43,3 +43,13 @@ ol, ul, dl {
 p.align-center {
   text-align: center;
 }
+span.align-left,
+img.align-left {
+  margin-right: 2em;
+  margin-bottom: 1em;
+}
+span.align-right,
+img.align-right {
+  margin-left: 2em;
+  margin-bottom: 1em;
+}
diff --git a/core/modules/ckeditor5/core/modules/ckeditor/js/plugins/backdropimagecaption/plugin.js b/core/modules/ckeditor5/core/modules/ckeditor/js/plugins/backdropimagecaption/plugin.js
@@ -86,7 +86,10 @@ CKEDITOR.plugins.add('backdropimagecaption', {
         // CKEditor seems to apply the caption class to downcast elements, which
         // we do not want. Make sure that the caption class doesn't end up in
         // the raw source.
-        img.removeClass(editor.config.image2_captionedClass);
+        var classes = editor.config.image2_captionedClass.split(' ');
+        for (var i = 0; i < classes.length; i++) {
+          element.removeClass(classes[i]);
+        }
 
         return img;
       };
@@ -107,7 +110,10 @@ CKEDITOR.plugins.add('backdropimagecaption', {
         }
 
         // Remove any caption classes from the raw element itself.
-        element.removeClass(editor.config.image2_captionedClass);
+        var classes = editor.config.image2_captionedClass.split(' ');
+        for (var i = 0; i < classes.length; i++) {
+          element.removeClass(classes[i]);
+        }
 
         var attrs = element.attributes;
         var retElement = element;