diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-04-15 14:02:13 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-04-15 14:02:13 +0000 |
| commit | fef3434bdfecc0508b34db853a86002609a7f7d3 (patch) | |
| tree | 694b2cdaf32ddf6a446e5450dc7dd960e12ea76b /files/js | |
| parent | 738601f4fe2e899fbb77564fd71f7d9f14cffb3f (diff) | |
| parent | 679ddc0e327991a097c7ca52c11ef13d18cd389c (diff) | |
| download | nextcloud-server-fef3434bdfecc0508b34db853a86002609a7f7d3.tar.gz nextcloud-server-fef3434bdfecc0508b34db853a86002609a7f7d3.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
Diffstat (limited to 'files/js')
| -rw-r--r-- | files/js/filelist.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/files/js/filelist.js b/files/js/filelist.js index 533e03b43cd..5bd85fc29ef 100644 --- a/files/js/filelist.js +++ b/files/js/filelist.js @@ -1,4 +1,5 @@ FileList={ + useUndo:true, update:function(fileListHtml) { $('#fileList').empty().html(fileListHtml); }, @@ -163,7 +164,7 @@ FileList={ }); }, do_delete:function(files){ - if(FileList.deleteFiles){//finish any ongoing deletes first + if(FileList.deleteFiles || !FileList.useUndo){//finish any ongoing deletes first FileList.finishDelete(function(){ FileList.do_delete(files); }); @@ -196,7 +197,6 @@ FileList={ boolOperationFinished(data, function(){ $('#notification').fadeOut(); $.each(FileList.deleteFiles,function(index,file){ -// alert(file); FileList.remove(file); }); FileList.deleteCanceled=true; @@ -225,7 +225,7 @@ $(document).ready(function(){ } $('#notification').fadeOut(); }); - + FileList.useUndo=('onbeforeunload' in window) $(window).bind('beforeunload', function (){ FileList.finishDelete(null,true); }); |