summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-10-07 18:16:09 +0200
committerVincent Petry <pvince81@owncloud.com>2015-10-14 14:26:16 +0200
commita4cbdfdc1f7d5d0bc13f025d5d9cd359a4120fa2 (patch)
tree473ad9a62fea8164e12728f6340b7e445614508f /apps
parent06bfe1139b0c450e3ed4e03a985dd88801c53f30 (diff)
downloadnextcloud-server-a4cbdfdc1f7d5d0bc13f025d5d9cd359a4120fa2.tar.gz
nextcloud-server-a4cbdfdc1f7d5d0bc13f025d5d9cd359a4120fa2.zip
showTemporary instead of show for notifications
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/filelist.js28
1 files changed, 8 insertions, 20 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 6cf82391baf..1a3291db27d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1350,7 +1350,7 @@
) {
OC.redirect(OC.generateUrl('apps/files'));
}
- OC.Notification.show(result.data.message);
+ OC.Notification.showTemporary(result.data.message);
return false;
}
@@ -1358,7 +1358,7 @@
if (result.status === 403) {
// Go home
this.changeDirectory('/');
- OC.Notification.show(t('files', 'This operation is forbidden'));
+ OC.Notification.showTemporary(t('files', 'This operation is forbidden'));
return false;
}
@@ -1366,7 +1366,7 @@
if (result.status === 500) {
// Go home
this.changeDirectory('/');
- OC.Notification.show(t('files', 'This directory is unavailable, please check the logs or contact the administrator'));
+ OC.Notification.showTemporary(t('files', 'This directory is unavailable, please check the logs or contact the administrator'));
return false;
}
@@ -1640,15 +1640,11 @@
} else {
OC.Notification.hide();
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 moving file.'));
+ OC.Notification.showTemporary(t('files', 'Error moving file.'));
}
- // hide notification after 10 sec
- setTimeout(function() {
- OC.Notification.hide();
- }, 10000);
}
} else {
OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
@@ -2013,15 +2009,11 @@
self.updateStorageStatistics();
} 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
@@ -2262,11 +2254,7 @@
*/
_showPermissionDeniedNotification: function() {
var message = t('core', 'You don’t have permission to upload or create files here');
- OC.Notification.show(message);
- //hide notification after 10 sec
- setTimeout(function() {
- OC.Notification.hide();
- }, 5000);
+ OC.Notification.showTemporary(message);
},
/**