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 <vincent@nextcloud.com>2022-07-27 15:29:26 +0300
committerVincent Petry <vincent@nextcloud.com>2022-07-27 15:29:26 +0300
commit00066cbeaf81185a34f5c2a660cef54ff5737487 (patch)
treee133d9f3000f498d485023f82909e50572cd5e6d /apps/files
parentfc276ba42f2c4a27e6ee33b6ec3ed427b4f01f75 (diff)
Remove more legacy ids
Remove more unused legacy ids from early ownCloud times. This reduces the number of duplicate ids in the DOM. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/filelist.js2
-rw-r--r--apps/files/js/files.js3
-rw-r--r--apps/files/templates/list.php1
-rw-r--r--apps/files/tests/js/fileUploadSpec.js2
-rw-r--r--apps/files/tests/js/filelistSpec.js2
5 files changed, 3 insertions, 7 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4fbf1ac4a25..1530787b83a 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2475,7 +2475,7 @@
* @param show true for enabling, false for disabling
*/
showActions: function(show){
- this.$el.find('.actions,#file_action_panel').toggleClass('hidden', !show);
+ this.$el.find('.actions').toggleClass('hidden', !show);
if (show){
// make sure to display according to permissions
var permissions = this.getDirectoryPermissions();
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 5f00ce2cb22..1aa39eab523 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -306,9 +306,6 @@
initialize: function() {
Files.bindKeyboardShortcuts(document, $);
- // TODO: move file list related code (upload) to OCA.Files.FileList
- $('#file_action_panel').attr('activeAction', false);
-
// drag&drop support using jquery.fileupload
// TODO use OC.dialogs
$(document).bind('drop dragover', function (e) {
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 1b45129195b..13583c23cbf 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -3,7 +3,6 @@
<div id="uploadprogresswrapper">
</div>
</div>
- <div id="file_action_panel"></div>
<div class="notCreatable notPublic hidden">
<div class="icon-alert-outline"></div>
<?php p($l->t('You do not have permission to upload or create files here'))?>
diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
index c3c88d256bb..1fac6322808 100644
--- a/apps/files/tests/js/fileUploadSpec.js
+++ b/apps/files/tests/js/fileUploadSpec.js
@@ -141,7 +141,7 @@ describe('OC.Upload tests', function() {
'<th class="hidden column-name">' +
'<input type="checkbox" id="select_all_files" class="select-all">' +
'<a class="name columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' +
- '<span id="selectedActionsList" class="selectedActions hidden">' +
+ '<span class="selectedActions hidden">' +
'<a href class="download"><img src="actions/download.svg">Download</a>' +
'<a href class="delete-selected">Delete</a></span>' +
'</th>' +
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index e69a62c0c3e..b1153fc0a01 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -119,7 +119,7 @@ describe('OCA.Files.FileList tests', function() {
'<th class="hidden column-name">' +
'<input type="checkbox" id="select_all_files" class="select-all checkbox">' +
'<a class="name columntitle" href="#" onclick="event.preventDefault()" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' +
- '<span id="selectedActionsList" class="selectedActions hidden">' +
+ '<span class="selectedActions hidden">' +
'<a class="actions-selected" href="#" onclick="event.preventDefault()"><span class="icon icon-more"></span><span>Actions</span></a>' +
'</th>' +
'<th class="hidden column-size"><a class="columntitle" href="#" onclick="event.preventDefault()" data-sort="size"><span class="sort-indicator"></span></a></th>' +