summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2017-08-28 10:56:21 +0200
committerThomas Citharel <tcit@tcit.fr>2017-09-15 16:53:10 +0200
commit5767659d226a47d59bc6a024033e54c3741eebc7 (patch)
treeac130fe55f0ff1356f0dd37d87725d628b6dbfdb
parent07c1137abfb792b78b140f97811af4d96fed072c (diff)
downloadnextcloud-server-5767659d226a47d59bc6a024033e54c3741eebc7.tar.gz
nextcloud-server-5767659d226a47d59bc6a024033e54c3741eebc7.zip
Change move copy order and debug leftover
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
-rw-r--r--apps/files/js/fileactions.js4
-rw-r--r--apps/files/templates/list.php2
-rw-r--r--core/js/oc-dialogs.js1
3 files changed, 3 insertions, 4 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 668960d5937..3da9b06b0d3 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -618,8 +618,8 @@
});
this.registerAction({
- name: 'CopyMove',
- displayName: t('files', 'Copy or Move'),
+ name: 'MoveCopy',
+ displayName: t('files', 'Move or copy'),
mime: 'all',
order: -25,
permissions: OC.PERMISSION_UPDATE,
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 3857ad3badd..f3b6759644c 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -49,7 +49,7 @@
<span id="selectedActionsList" class="selectedActions">
<a href="" class="copy-move">
<span class="icon icon-external"></span>
- <span><?php p($l->t('Copy or Move'))?></span>
+ <span><?php p($l->t('Move or copy'))?></span>
</a>
<a href="" class="download">
<span class="icon icon-download"></span>
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 902d5263d04..1bc1399466d 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -257,7 +257,6 @@ var OCdialogs = {
};
var copyCallback = function () {
- console.log('copy callback');
functionToCall(OCdialogs.FILEPICKER_TYPE_COPY);
};