diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-08-15 15:31:42 -0700 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-08-15 15:31:42 -0700 |
| commit | d2767faf6104f4a4f0330c1771c488beea6245cd (patch) | |
| tree | 8a40a297db061318519e902fa7755da5f5bf18fc /apps/files/js | |
| parent | bd1895bdf8dff07bf9dc9803ce991e39daa52acc (diff) | |
| parent | b632b8f4e41f12d62fd4abdefa63fc9f9accd432 (diff) | |
| download | nextcloud-server-d2767faf6104f4a4f0330c1771c488beea6245cd.tar.gz nextcloud-server-d2767faf6104f4a4f0330c1771c488beea6245cd.zip | |
Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/fileactions.js | 7 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index de67d13559e..5027211b536 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -123,14 +123,11 @@ var FileActions = { img = img(file); } if (typeof trashBinApp !== 'undefined' && trashBinApp) { - var html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete" />'; + var html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete delete-icon" />'; } else { - var html = '<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" />'; + var html = '<a href="#" class="action delete delete-icon" />'; } var element = $(html); - if (img) { - element.append($('<img class ="svg" src="' + img + '"/>')); - } element.data('action', actions['Delete']); element.on('click', {a: null, elem: parent, actionFunc: actions['Delete']}, actionHandler); parent.parent().children().last().append(element); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index f7cc3767b25..10801af3ead 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -15,7 +15,7 @@ var FileList={ // filename td td = $('<td></td>').attr({ "class": "filename", - "style": 'background-image:url('+iconurl+')' + "style": 'background-image:url('+iconurl+'); background-size: 16px;' }); td.append('<input type="checkbox" />'); var link_elem = $('<a></a>').attr({ @@ -371,9 +371,7 @@ var FileList={ } for (var i=0; i<files.length; i++) { var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete"); - var oldHTML = deleteAction.html(); - var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>'; - deleteAction.html(newHTML); + deleteAction.removeClass('delete-icon').addClass('progress-icon'); } // Finish any existing actions if (FileList.lastAction) { @@ -395,8 +393,8 @@ var FileList={ checkTrashStatus(); } else { $.each(files,function(index,file) { - var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash"); - deleteAction.html(oldHTML); + var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete"); + deleteAction.removeClass('progress-icon').addClass('delete-icon'); }); } }); |