Skip to content
Snippets Groups Projects
Commit d2f9c3e8 authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge pull request #1809 from owncloud/fix_ie_deletefolder

replaced for in loops with normal enumerating loops to fix #1803
parents fbfd54d2 3b9d9eea
No related branches found
No related tags found
No related merge requests found
...@@ -315,8 +315,8 @@ var FileList={ ...@@ -315,8 +315,8 @@ var FileList={
do_delete:function(files){ do_delete:function(files){
if(files.substr){ if(files.substr){
files=[files]; files=[files];
} }
for (var i in files) { for (var i=0; i<files.length; i++) {
var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete"); var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
var oldHTML = deleteAction[0].outerHTML; var oldHTML = deleteAction[0].outerHTML;
var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>'; var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
......
...@@ -88,7 +88,7 @@ $(document).ready(function() { ...@@ -88,7 +88,7 @@ $(document).ready(function() {
} }
} }
processSelection(); processSelection();
}); });
$('.undelete').click('click',function(event) { $('.undelete').click('click',function(event) {
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', 'loader.gif') +'"></a>';
...@@ -96,7 +96,7 @@ $(document).ready(function() { ...@@ -96,7 +96,7 @@ $(document).ready(function() {
var fileslist=files.join(';'); var fileslist=files.join(';');
var dirlisting=getSelectedFiles('dirlisting')[0]; var dirlisting=getSelectedFiles('dirlisting')[0];
for (var i in files) { for (var i=0; i<files.length; i++) {
var undeleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date"); var undeleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date");
undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner; undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
} }
...@@ -111,7 +111,7 @@ $(document).ready(function() { ...@@ -111,7 +111,7 @@ $(document).ready(function() {
if (result.status != 'success') { if (result.status != 'success') {
OC.dialogs.alert(result.data.message, 'Error'); OC.dialogs.alert(result.data.message, 'Error');
} }
}); });
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment