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>

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4fbf1ac4a25468637c0e118a89548987422a07d1..1530787b83ab5d1a42d6144a91d7959bf05d4055 100644 (file)
--- 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 5f00ce2cb225f39f5d970f07499046c9f0f1af58..1aa39eab52379898644e179c918e1b46b125a271 100644 (file)
--- 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 1b45129195b2ad13deda32029fc5b60047947e17..13583c23cbf84df567bd5230f72b21accde2eb1e 100644 (file)
--- 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 c3c88d256bb599aa901129773ebbf1b5017ffe97..1fac63228089abf2bfe8f7004032516a663b331f 100644 (file)
--- 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 e69a62c0c3ebaef24154a9e53d96837c5d565725..b1153fc0a01f0cb6757ac171f0d5c2281787b1ca 100644 (file)
--- 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>' +

diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 918831388457c58da4667612f969ffa929cb0cfa..64bd98ab8d865d48d7fd3fc6835d7f0b41c22ba9 100644 (file)
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -307,7 +307,6 @@ OCA.Sharing.PublicApp = {
                        });
 
                        if (hideDownload === 'true') {
-                               this.fileList.$el.find('#headerSelection').remove();
                                this.fileList.$el.find('.summary').find('td:first-child').remove();
                        }
                }