diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:26:55 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:26:55 +0200 |
| commit | dc18e65b4675d1d458a42ef8e6125bf6680ba157 (patch) | |
| tree | 30072917dd3290cd65a8cfac764feb26e56594c1 /files/js/filelist.js | |
| parent | 8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0 (diff) | |
| parent | 12818093007d5bdce5519b5015e2a0748c98e24d (diff) | |
| download | nextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.tar.gz nextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.zip | |
fix merge conflicts
Diffstat (limited to 'files/js/filelist.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); }); |