Skip to content

Commit 69c6724

Browse files
committed
Merge branch 't/13032' into major
2 parents c666d44 + b381fb4 commit 69c6724

File tree

3 files changed

+30
-1
lines changed

3 files changed

+30
-1
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Fixed Issues:
1010
* [#13197](http://dev.ckeditor.com/ticket/13197): Fixed: Linked inline image2's alignment class is not transferred to widget wrapper.
1111
* [#13199](http://dev.ckeditor.com/ticket/13199): Fixed: Embedsemantic does not support widget classes.
1212
* [#13003](http://dev.ckeditor.com/ticket/13003): Fixed: Anchors are uploaded when moving them by drag and drop.
13+
* [#13032](http://dev.ckeditor.com/ticket/13032): Fixed: When upload is done notification update should be marked as important.
1314
* Toolbar configurators:
1415
* [#13185](http://dev.ckeditor.com/ticket/13185): Fixed: Wrong position of the suggestion box if there is not enough space below the caret.
1516
* [#13138](http://dev.ckeditor.com/ticket/13138): Fixed: The "Toggle empty elements" button label is unclear.

plugins/uploadwidget/plugin.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,8 @@
458458
message: tasks == 1 ?
459459
editor.lang.uploadwidget.doneOne :
460460
editor.lang.uploadwidget.doneMany.replace( '%1', tasks ),
461-
type: 'success'
461+
type: 'success',
462+
important: 1
462463
} );
463464
}
464465
} );

tests/plugins/uploadimage/uploadimage.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,33 @@
115115
}, 10 );
116116
},
117117

118+
'test finish upload notification marked as important and is visible (#13032).': function() {
119+
var editor = this.editors.classic;
120+
121+
pasteFiles( editor, [ bender.tools.getTestPngFile() ] );
122+
123+
var loader = editor.uploadsRepository.loaders[ 0 ];
124+
125+
loader.data = bender.tools.pngBase64;
126+
loader.changeStatus( 'uploading' );
127+
128+
var area = editor._.notificationArea;
129+
130+
// Closing notification.
131+
area.notifications[ 0 ].hide();
132+
133+
assertUploadingWidgets( editor, LOADED_IMG );
134+
135+
// IE needs to wait for image to be loaded so it can read width and height of the image.
136+
wait( function() {
137+
loader.url = IMG_URL;
138+
loader.changeStatus( 'uploaded' );
139+
140+
assert.areSame( 1, area.notifications.length, 'Successs notification is present because it\'s important one.' );
141+
assert.areSame( 'success', area.notifications[ 0 ].type );
142+
}, 10 );
143+
},
144+
118145
'test inline with image2 (integration test)': function() {
119146
var editor = this.editors.inline;
120147

0 commit comments

Comments
 (0)