[Pkg-owncloud-commits] [owncloud] 56/129: Merge pull request #19780 from owncloud/stable8.2-files-delete-hidenotif

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit f3d58eebfca0c94605b9045338bccb9fdf117550
Merge: 0ea4274 7114452
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Oct 20 15:47:30 2015 +0200

    Merge pull request #19780 from owncloud/stable8.2-files-delete-hidenotif
    
    [stable8.2] Hide notification on delete

 apps/files/js/filelist.js | 2 ++
 1 file changed, 2 insertions(+)

diff --cc apps/files/js/filelist.js
index 1a3291d,7c9ae01..57b4d86
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@@ -2007,13 -2011,19 +2007,15 @@@
  							self.fileSummary.update();
  							self.updateSelectionSummary();
  							self.updateStorageStatistics();
+ 							// in case there was a "storage full" permanent notification
+ 							OC.Notification.hide();
  						} else {
  							if (result.status === 'error' && result.data.message) {
 -								OC.Notification.show(result.data.message);
 +								OC.Notification.showTemporary(result.data.message);
  							}
  							else {
 -								OC.Notification.show(t('files', 'Error deleting file.'));
 +								OC.Notification.showTemporary(t('files', 'Error deleting file.'));
  							}
 -							// hide notification after 10 sec
 -							setTimeout(function() {
 -								OC.Notification.hide();
 -							}, 10000);
  							if (params.allfiles) {
  								// reload the page as we don't know what files were deleted
  								// and which ones remain

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git