summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-08-01 12:56:08 +0200
committerGitHub <noreply@github.com>2018-08-01 12:56:08 +0200
commit369a6c13eb34a96fd04dd506b5dbd215bdf42087 (patch)
tree78c79b557ea728910886272e279cbde266ca0a70
parent8162b349e700294d481c0d08bb7da9917868eee6 (diff)
parent6b9093ce6d15fcdd271a1016b364ce09b2b49aca (diff)
downloadnextcloud-server-369a6c13eb34a96fd04dd506b5dbd215bdf42087.tar.gz
nextcloud-server-369a6c13eb34a96fd04dd506b5dbd215bdf42087.zip
Merge pull request #10474 from danielkesselberg/bugfix/10379/no-files-in-here
Set emptyText depending on filepicker type
-rw-r--r--core/js/oc-dialogs.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 3c3ed1469cb..d346b5231d1 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -193,6 +193,11 @@ var OCdialogs = {
type = this.FILEPICKER_TYPE_CHOOSE;
}
+ var emptyText = t('core', 'No files in here');
+ if (type === this.FILEPICKER_TYPE_COPY || type === this.FILEPICKER_TYPE_MOVE || type === this.FILEPICKER_TYPE_COPY_MOVE) {
+ emptyText = t('core', 'No more subfolders in here');
+ }
+
this.filepicker.loading = true;
this.filepicker.filesClient = (OCA.Sharing && OCA.Sharing.PublicApp && OCA.Sharing.PublicApp.fileList)? OCA.Sharing.PublicApp.fileList.filesClient: OC.Files.getClient();
$.when(this._getFilePickerTemplate()).then(function($tmpl) {
@@ -204,7 +209,7 @@ var OCdialogs = {
self.$filePicker = $tmpl.octemplate({
dialog_name: dialogName,
title: title,
- emptytext: t('core', 'No files in here')
+ emptytext: emptyText
}).data('path', '').data('multiselect', multiselect).data('mimetype', mimetypeFilter);
if (modal === undefined) {