Fixed image upload on Safari and Edge.

ckeditor · Aug 10, 2017 · 4815fd1 · 4815fd1
1 parent fa2c7ad
commit 4815fd1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/imageuploadbutton.js b/src/imageuploadbutton.js
@@ -50,7 +50,7 @@ export default class ImageUploadButton extends Plugin {
 			view.bind( 'isEnabled' ).to( command );
 
 			view.on( 'done', ( evt, files ) => {
-				for ( const file of files ) {
+				for ( const file of Array.from( files ) ) {
 					const insertAt = findOptimalInsertionPosition( editor.document.selection );
 
 					if ( isImageType( file ) ) {

diff --git a/tests/imageuploadbutton.js b/tests/imageuploadbutton.js
@@ -130,5 +130,19 @@ describe( 'ImageUploadButton', () => {
 		button.fire( 'done', [ file ] );
 		sinon.assert.notCalled( executeStub );
 	} );
+
+	it( 'should work even if the FileList does not support iterators', () => {
+		const executeStub = sinon.stub( editor, 'execute' );
+		const button = editor.ui.componentFactory.create( 'insertImage' );
+		const files = {
+			0: createNativeFileMock(),
+			length: 1
+		};
+
+		button.fire( 'done', files );
+		sinon.assert.calledOnce( executeStub );
+		expect( executeStub.firstCall.args[ 0 ] ).to.equal( 'imageUpload' );
+		expect( executeStub.firstCall.args[ 1 ].file ).to.equal( files[ 0 ] );
+	} );
 } );