8
0
Просмотр исходного кода

Internal: Image resize is no longer a dependency of core Image plugin.

This reverts commit 9f72207a5067889a624bfd037863faa2637c19a9.
Marek Lewandowski 6 лет назад
Родитель
Сommit
8822bd777c

+ 1 - 2
packages/ckeditor5-image/src/image.js

@@ -11,7 +11,6 @@ import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ImageEditing from '../src/image/imageediting';
 import Widget from '@ckeditor/ckeditor5-widget/src/widget';
 import ImageTextAlternative from './imagetextalternative';
-import ImageResize from './image/imageresize';
 
 import '../theme/image.css';
 
@@ -35,7 +34,7 @@ export default class Image extends Plugin {
 	 * @inheritDoc
 	 */
 	static get requires() {
-		return [ ImageEditing, Widget, ImageTextAlternative, ImageResize ];
+		return [ ImageEditing, Widget, ImageTextAlternative ];
 	}
 
 	/**

+ 6 - 12
packages/ckeditor5-image/tests/image.js

@@ -66,9 +66,8 @@ describe( 'Image', () => {
 			setModelData( model, '[<image alt="alt text" src="/assets/sample.png"></image>]' );
 
 			expect( getViewData( view ) ).to.equal(
-				'[<figure class="ck-widget ck-widget_selected ck-widget_with-resizer image" contenteditable="false">' +
+				'[<figure class="ck-widget ck-widget_selected image" contenteditable="false">' +
 					'<img alt="alt text" src="/assets/sample.png"></img>' +
-					'<div class="ck ck-widget__resizer-wrapper"></div>' +
 				'</figure>]'
 			);
 
@@ -80,9 +79,8 @@ describe( 'Image', () => {
 			setModelData( model, '[<image src="/assets/sample.png" alt=""></image>]' );
 
 			expect( getViewData( view ) ).to.equal(
-				'[<figure class="ck-widget ck-widget_selected ck-widget_with-resizer image" contenteditable="false">' +
+				'[<figure class="ck-widget ck-widget_selected image" contenteditable="false">' +
 				'<img alt="" src="/assets/sample.png"></img>' +
-				'<div class="ck ck-widget__resizer-wrapper"></div>' +
 				'</figure>]'
 			);
 
@@ -97,13 +95,11 @@ describe( 'Image', () => {
 			);
 
 			expect( getViewData( view ) ).to.equal(
-				'[<figure class="ck-widget ck-widget_selected ck-widget_with-resizer image" contenteditable="false">' +
+				'[<figure class="ck-widget ck-widget_selected image" contenteditable="false">' +
 				'<img alt="alt text" src="/assets/sample.png"></img>' +
-				'<div class="ck ck-widget__resizer-wrapper"></div>' +
 				'</figure>]' +
-				'<figure class="ck-widget ck-widget_with-resizer image" contenteditable="false">' +
+				'<figure class="ck-widget image" contenteditable="false">' +
 				'<img alt="alt text" src="/assets/sample.png"></img>' +
-				'<div class="ck ck-widget__resizer-wrapper"></div>' +
 				'</figure>'
 			);
 
@@ -113,13 +109,11 @@ describe( 'Image', () => {
 			} );
 
 			expect( getViewData( view ) ).to.equal(
-				'<figure class="ck-widget ck-widget_with-resizer image" contenteditable="false">' +
+				'<figure class="ck-widget image" contenteditable="false">' +
 				'<img alt="alt text" src="/assets/sample.png"></img>' +
-				'<div class="ck ck-widget__resizer-wrapper"></div>' +
 				'</figure>' +
-				'[<figure class="ck-widget ck-widget_selected ck-widget_with-resizer image" contenteditable="false">' +
+				'[<figure class="ck-widget ck-widget_selected image" contenteditable="false">' +
 				'<img alt="alt text" src="/assets/sample.png"></img>' +
-				'<div class="ck ck-widget__resizer-wrapper"></div>' +
 				'</figure>]'
 			);
 		} );

+ 3 - 2
packages/ckeditor5-image/tests/imageresize/resize.js

@@ -10,6 +10,7 @@ import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor'
 
 import ParagraphPlugin from '@ckeditor/ckeditor5-paragraph/src/paragraph';
 import ImagePlugin from '../../src/image';
+import ImageResizePlugin from '../../src/image/imageresize';
 import ImageStyle from '../../src/imagestyle';
 import UndoPlugin from '@ckeditor/ckeditor5-undo/src/undo';
 import TablePlugin from '@ckeditor/ckeditor5-table/src/table';
@@ -18,7 +19,7 @@ import {
 	getData
 } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
-describe.only( 'Image resizer', () => {
+describe( 'Image resizer', () => {
 	const FIXTURE_WIDTH = 100;
 	const FIXTURE_HEIGHT = 50;
 	const MOUSE_BUTTON_MAIN = 0; // Id of left mouse button.
@@ -52,7 +53,7 @@ describe.only( 'Image resizer', () => {
 
 		return ClassicEditor
 			.create( editorElement, {
-				plugins: [ ImagePlugin, ImageStyle, ParagraphPlugin, UndoPlugin, TablePlugin ]
+				plugins: [ ImagePlugin, ImageStyle, ParagraphPlugin, UndoPlugin, TablePlugin, ImageResizePlugin ]
 			} )
 			.then( newEditor => {
 				editor = newEditor;

+ 2 - 1
packages/ckeditor5-image/tests/manual/resize.js

@@ -13,6 +13,7 @@ import ImagePlugin from '../../src/image';
 import ImageStyle from '../../src/imagestyle';
 import ImageToolbar from '../../src/imagetoolbar';
 import ImageCaption from '../../src/imagecaption';
+import ImageResize from '../../src/image/imageresize';
 import UndoPlugin from '@ckeditor/ckeditor5-undo/src/undo';
 import ClipboardPlugin from '@ckeditor/ckeditor5-clipboard/src/clipboard';
 import List from '@ckeditor/ckeditor5-list/src/list';
@@ -22,7 +23,7 @@ import Indent from '@ckeditor/ckeditor5-indent/src/indent';
 import IndentBlock from '@ckeditor/ckeditor5-indent/src/indentblock';
 
 const commonConfig = {
-	plugins: [ EnterPlugin, TypingPlugin, ParagraphPlugin, ImagePlugin, ImageStyle, ImageToolbar, ImageCaption,
+	plugins: [ EnterPlugin, TypingPlugin, ParagraphPlugin, ImagePlugin, ImageStyle, ImageToolbar, ImageCaption, ImageResize,
 		UndoPlugin, ClipboardPlugin, List, BlockQuote, Table, Indent, IndentBlock ],
 	toolbar: [ 'undo', 'redo', 'bulletedList', 'numberedList', 'blockQuote', 'insertTable', 'indent' ],
 	image: {