8
0
Quellcode durchsuchen

Merge branch 'master' into t/18

Maciej vor 7 Jahren
Ursprung
Commit
af25d3a303

+ 3 - 1
packages/ckeditor5-ckfinder/README.md

@@ -1,4 +1,4 @@
-CKEditor 5 CKFinder with Cloud Services
+CKEditor 5's CKFinder integration
 =========================================
 
 [![Join the chat at https://gitter.im/ckeditor/ckeditor5](https://badges.gitter.im/ckeditor/ckeditor5.svg)](https://gitter.im/ckeditor/ckeditor5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -10,6 +10,8 @@ CKEditor 5 CKFinder with Cloud Services
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-ckfinder/status.svg)](https://david-dm.org/ckeditor/ckeditor5-ckfinder)
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-ckfinder/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-ckfinder?type=dev)
 
+The [CKFinder](https://ckeditor.com/ckfinder/) file browser integration for CKEditor 5.
+
 ## Documentation
 
 See the [`@ckeditor/ckeditor5-ckfinder` package](https://ckeditor.com/docs/ckeditor5/latest/api/ckfinder.html) page in [CKEditor 5 documentation](https://ckeditor.com/docs/ckeditor5/latest/).

+ 1 - 1
packages/ckeditor5-ckfinder/docs/api/ckfinder.md

@@ -2,7 +2,7 @@
 category: api-reference
 ---
 
-# CKEditor 5 CKFinder
+# CKEditor 5's CKFinder integration
 
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-ckfinder.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-ckfinder)
 

+ 1 - 21
packages/ckeditor5-ckfinder/src/ckfindercommand.js

@@ -13,8 +13,6 @@ import Command from '@ckeditor/ckeditor5-core/src/command';
 import Notification from '@ckeditor/ckeditor5-ui/src/notification/notification';
 import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
 
-import { findOptimalInsertionPosition } from '@ckeditor/ckeditor5-widget/src/utils';
-
 /**
  * The CKFinder command. It is used by the {@link module:ckfinder/ckfinderediting~CKFinderEditing ckfinder editng feature}
  * to open a CKFinder file browser to insert an image or a link to a file into content.
@@ -142,23 +140,5 @@ function insertImages( editor, urls ) {
 		return;
 	}
 
-	const model = editor.model;
-
-	// The first image will be inserted according to image inserting algorithm. Next one after the previous one.
-	let insertAt = findOptimalInsertionPosition( model.document.selection, model );
-
-	model.change( writer => {
-		for ( const url of urls ) {
-			const imageElement = writer.createElement( 'image', { src: url } );
-
-			// Insert image & update the selection.
-			model.insertContent( imageElement, insertAt );
-
-			// Inserting an image might've failed due to schema regulations.
-			if ( imageElement.parent ) {
-				writer.setSelection( imageElement, 'on' );
-				insertAt = writer.createPositionAfter( imageElement );
-			}
-		}
-	} );
+	editor.execute( 'imageInsert', { source: urls } );
 }

+ 2 - 2
packages/ckeditor5-ckfinder/src/ckfinderui.js

@@ -10,7 +10,7 @@
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
 
-import ckfinderIcon from '@ckeditor/ckeditor5-ui/theme/icons/dropdown-arrow.svg';
+import browseFilesIcon from '../theme/icons/browse-files.svg';
 
 /**
  * The CKFinder UI plugin. It introduces he `'ckfinder'` toolbar button.
@@ -40,7 +40,7 @@ export default class CKFinderUI extends Plugin {
 
 			button.set( {
 				label: t( 'Insert image or file' ),
-				icon: ckfinderIcon,
+				icon: browseFilesIcon,
 				tooltip: true
 			} );
 

+ 2 - 2
packages/ckeditor5-ckfinder/tests/ckfinderui.js

@@ -10,9 +10,9 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import global from '@ckeditor/ckeditor5-utils/src/dom/global';
 
 import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
-import ckfinderIcon from '@ckeditor/ckeditor5-ui/theme/icons/dropdown-arrow.svg';
 
 import CKFinder from '../src/ckfinder';
+import browseFilesIcon from '../theme/icons/browse-files.svg';
 
 describe( 'CKFinderUI', () => {
 	let editorElement, editor, button;
@@ -60,7 +60,7 @@ describe( 'CKFinderUI', () => {
 		} );
 
 		it( 'should set an #icon of the #buttonView', () => {
-			expect( button.icon ).to.equal( ckfinderIcon );
+			expect( button.icon ).to.equal( browseFilesIcon );
 		} );
 
 		it( 'should enable tooltips for the #buttonView', () => {