浏览代码

Removed custom ck-editable_hidden class and used generic ck-hidden class in image caption styles.

Szymon Kupś 8 年之前
父节点
当前提交
5ca2796987

+ 3 - 3
packages/ckeditor5-image/src/imagecaption/imagecaptionengine.js

@@ -98,7 +98,7 @@ export default class ImageCaptionEngine extends Plugin {
 
 		// Hide last selected caption if have no child elements.
 		if ( this._lastSelectedCaption && !this._lastSelectedCaption.childCount ) {
-			this._lastSelectedCaption.addClass( 'ck-editable_hidden' );
+			this._lastSelectedCaption.addClass( 'ck-hidden' );
 		}
 
 		// If whole image widget is selected.
@@ -114,7 +114,7 @@ export default class ImageCaptionEngine extends Plugin {
 		}
 
 		if ( viewCaption ) {
-			viewCaption.removeClass( 'ck-editable_hidden' );
+			viewCaption.removeClass( 'ck-hidden' );
 			this._lastSelectedCaption = viewCaption;
 		}
 	}
@@ -171,7 +171,7 @@ function captionModelToView( elementCreator, hide = true ) {
 
 			// Hide if empty.
 			if ( !captionElement.childCount ) {
-				viewCaption.addClass( 'ck-editable_hidden' );
+				viewCaption.addClass( 'ck-hidden' );
 			}
 
 			insertViewCaptionAndBind( viewCaption, data.item, viewImage, conversionApi.mapper );

+ 5 - 5
packages/ckeditor5-image/tests/imagecaption/imagecaptionengine.js

@@ -112,7 +112,7 @@ describe( 'ImageCaptionEngine', () => {
 				expect( getViewData( viewDocument, { withoutSelection: true } ) ).to.equal(
 					'<figure class="image ck-widget" contenteditable="false">' +
 						'<img src="img.png"></img>' +
-						'<figcaption class="ck-editable ck-editable_hidden" contenteditable="true"></figcaption>' +
+						'<figcaption class="ck-editable ck-hidden" contenteditable="true"></figcaption>' +
 					'</figure>'
 				);
 			} );
@@ -163,7 +163,7 @@ describe( 'ImageCaptionEngine', () => {
 			expect( getViewData( viewDocument ) ).to.equal(
 				'[]<figure class="image ck-widget" contenteditable="false">' +
 					'<img alt="" src=""></img>' +
-					'<figcaption class="ck-editable ck-editable_hidden" contenteditable="true"></figcaption>' +
+					'<figcaption class="ck-editable ck-hidden" contenteditable="true"></figcaption>' +
 				'</figure>'
 			);
 		} );
@@ -222,7 +222,7 @@ describe( 'ImageCaptionEngine', () => {
 			expect( getViewData( viewDocument ) ).to.equal(
 				'[]<figure class="image ck-widget" contenteditable="false">' +
 					'<img src=""></img>' +
-					'<figcaption class="ck-editable ck-editable_hidden" contenteditable="true"></figcaption>' +
+					'<figcaption class="ck-editable ck-hidden" contenteditable="true"></figcaption>' +
 				'</figure>'
 			);
 		} );
@@ -248,7 +248,7 @@ describe( 'ImageCaptionEngine', () => {
 			expect( getViewData( viewDocument ) ).to.equal(
 				'[]<figure class="image ck-widget" contenteditable="false">' +
 					'<img src=""></img>' +
-					'<figcaption class="ck-editable ck-editable_hidden" contenteditable="true"></figcaption>' +
+					'<figcaption class="ck-editable ck-hidden" contenteditable="true"></figcaption>' +
 				'</figure>'
 			);
 		} );
@@ -325,7 +325,7 @@ describe( 'ImageCaptionEngine', () => {
 				expect( getViewData( viewDocument ) ).to.equal(
 					'[]<figure class="image ck-widget" contenteditable="false">' +
 						'<img src=""></img>' +
-						'<figcaption class="ck-editable ck-editable_hidden" contenteditable="true"></figcaption>' +
+						'<figcaption class="ck-editable ck-hidden" contenteditable="true"></figcaption>' +
 					'</figure>'
 				);
 

+ 0 - 4
packages/ckeditor5-image/theme/imagecaption/theme.scss

@@ -9,9 +9,5 @@
 		padding: 10px;
 		font-size: .8em;
 		color: ck-color( 'text', 40 );
-
-		&_hidden {
-			display: none;
-		}
 	}
 }