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

Merge branch 'master' into i/6002

Marek Lewandowski 6 лет назад
Родитель
Сommit
0b2a37862c

+ 4 - 0
packages/ckeditor5-upload/.editorconfig

@@ -10,3 +10,7 @@ charset = utf-8
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[package.json]
+indent_style = space
+tab_width = 2

+ 0 - 5
packages/ckeditor5-upload/src/filerepository.js

@@ -440,11 +440,6 @@ class FileLoader {
 		return this.file
 			.then( file => this._reader.read( file ) )
 			.then( data => {
-				// Edge case: reader was aborted after file was read - double check for proper status.
-				if ( this.status !== 'reading' ) {
-					throw this.status;
-				}
-
 				this.status = 'idle';
 
 				return data;