aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/js/trash.js
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-07-24 15:53:48 +0200
committerRobin Appelman <icewind@owncloud.com>2013-07-24 15:53:48 +0200
commitad266a42534eb84a778d1a3a1642db38a4c50325 (patch)
treecb6190b8d048ffd0431199ed3a8829d0534b4a25 /apps/files_trashbin/js/trash.js
parenta945ce908b2e8447c4a93b14c711fc066d9e8daf (diff)
parent651479322b234eefff15031b188b353793cc7af5 (diff)
downloadnextcloud-server-ad266a42534eb84a778d1a3a1642db38a4c50325.tar.gz
nextcloud-server-ad266a42534eb84a778d1a3a1642db38a4c50325.zip
Merge branch 'master' into sabre-objecttree
Diffstat (limited to 'apps/files_trashbin/js/trash.js')
-rw-r--r--apps/files_trashbin/js/trash.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 691642811b7..87dfea491e7 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -2,9 +2,9 @@
$(document).ready(function() {
if (typeof FileActions !== 'undefined') {
- FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/undelete.png'), function(filename) {
+ FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
var tr=$('tr').filterAttr('data-file', filename);
- var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
+ var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date");
var files = tr.attr('data-file');
undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
@@ -94,7 +94,7 @@ $(document).ready(function() {
$('.undelete').click('click',function(event) {
event.preventDefault();
- var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
+ var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
var dirlisting=getSelectedFiles('dirlisting')[0];