Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-10-07 19:16:09 +0300
committerVincent Petry <pvince81@owncloud.com>2015-10-08 11:52:39 +0300
commit5bf43ec60af4d16a8693b88834afe1c698202824 (patch)
treef3102919349fc89e2eb1c3e4e6d18042abd9eb0a /apps/files
parentcd818e7419fb39d97683ecc5803534b0ed632596 (diff)
showTemporary instead of show for notifications
Diffstat (limited to 'apps/files')
-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);
},
/**