Skip to content

Commit

Permalink
Merge branch 't/13032' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed May 15, 2015
2 parents c666d44 + b381fb4 commit 69c6724
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -10,6 +10,7 @@ Fixed Issues:
* [#13197](http://dev.ckeditor.com/ticket/13197): Fixed: Linked inline image2's alignment class is not transferred to widget wrapper.
* [#13199](http://dev.ckeditor.com/ticket/13199): Fixed: Embedsemantic does not support widget classes.
* [#13003](http://dev.ckeditor.com/ticket/13003): Fixed: Anchors are uploaded when moving them by drag and drop.
* [#13032](http://dev.ckeditor.com/ticket/13032): Fixed: When upload is done notification update should be marked as important.
* Toolbar configurators:
* [#13185](http://dev.ckeditor.com/ticket/13185): Fixed: Wrong position of the suggestion box if there is not enough space below the caret.
* [#13138](http://dev.ckeditor.com/ticket/13138): Fixed: The "Toggle empty elements" button label is unclear.
Expand Down
3 changes: 2 additions & 1 deletion plugins/uploadwidget/plugin.js
Expand Up @@ -458,7 +458,8 @@
message: tasks == 1 ?
editor.lang.uploadwidget.doneOne :
editor.lang.uploadwidget.doneMany.replace( '%1', tasks ),
type: 'success'
type: 'success',
important: 1
} );
}
} );
Expand Down
27 changes: 27 additions & 0 deletions tests/plugins/uploadimage/uploadimage.js
Expand Up @@ -115,6 +115,33 @@
}, 10 );
},

'test finish upload notification marked as important and is visible (#13032).': function() {
var editor = this.editors.classic;

pasteFiles( editor, [ bender.tools.getTestPngFile() ] );

var loader = editor.uploadsRepository.loaders[ 0 ];

loader.data = bender.tools.pngBase64;
loader.changeStatus( 'uploading' );

var area = editor._.notificationArea;

// Closing notification.
area.notifications[ 0 ].hide();

assertUploadingWidgets( editor, LOADED_IMG );

// IE needs to wait for image to be loaded so it can read width and height of the image.
wait( function() {
loader.url = IMG_URL;
loader.changeStatus( 'uploaded' );

assert.areSame( 1, area.notifications.length, 'Successs notification is present because it\'s important one.' );
assert.areSame( 'success', area.notifications[ 0 ].type );
}, 10 );
},

'test inline with image2 (integration test)': function() {
var editor = this.editors.inline;

Expand Down

0 comments on commit 69c6724

Please sign in to comment.