Fix responsive images with alignment CKEDITOR - refs BT#13016

chamilo · Jul 17, 2017 · 03d7489 · 03d7489
1 parent 24c5ee4
commit 03d7489
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/app/Resources/public/css/editor.css b/app/Resources/public/css/editor.css
@@ -234,7 +234,6 @@ blockquote p {
   color: #843534;
 }
 .img-responsive {
-  display: block;
   max-width: 100%;
   height: auto;
 }
@@ -262,3 +261,9 @@ blockquote p {
 .img-va-text-bottom {
     vertical-align: text-bottom;
 }
+
+@media (max-width: 767px) {
+    .img-responsive {
+        display: block;
+    }
+}
diff --git a/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/plugin.js b/main/inc/lib/javascript/ckeditor/plugins/image2_chamilo/plugin.js
@@ -1028,6 +1028,18 @@
 
 			if ( align && align != 'none' ) {
 				var styles = CKEDITOR.tools.parseCssText( attrs.style || '' );
+				var allowedAllignments = {
+					'left': 1,
+					'right': 1,
+					'baseline': 1,
+					'top': 1,
+					'bottom': 1,
+					'middle': 1,
+					'super': 1,
+					'sub': 1,
+					'text-top': 1,
+					'text-bottom': 1
+				};
 
 				// When the widget is captioned (<figure>) and internally centering is done
 				// with widget's wrapper style/class, in the external data representation,
@@ -1047,7 +1059,7 @@
 				}
 
 				// If left/right, add float style to the downcasted element.
-				else if ( align in { left: 1, right: 1 } ) {
+				else if ( align in allowedAllignments ) {
 					if ( alignClasses )
 						attrsHolder.addClass( alignClasses[ alignmentsObj[ align ] ] );
 					else if (align == 'left' || align == 'right')