diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-12-20 03:30:50 -0800 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-12-20 03:30:50 -0800 |
| commit | 8e44404ae0205b03478b0631dcfd7e701040980f (patch) | |
| tree | ffb8f88a106bf602dea940eace4d0b37b859213d /apps | |
| parent | fb6b03e922a71581ad4361e1606ef609d4ba2a8b (diff) | |
| parent | 915126cae88c587cfe83dc08d0d541d0ca34c0c4 (diff) | |
| download | nextcloud-server-8e44404ae0205b03478b0631dcfd7e701040980f.tar.gz nextcloud-server-8e44404ae0205b03478b0631dcfd7e701040980f.zip | |
Merge pull request #925 from owncloud/fix_issue_918
Trigger the last action before continuing with a file upload
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/files.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 33c775fc8ec..d924dab3d60 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -203,6 +203,9 @@ $(document).ready(function() { var files = data.files; var totalSize=0; if(files){ + if (FileList.lastAction) { + FileList.lastAction(); + } for(var i=0;i<files.length;i++){ if(files[i].size ==0 && files[i].type== '') { @@ -513,6 +516,9 @@ $(document).ready(function() { $('#notification').fadeIn(); return; } + if (FileList.lastAction) { + FileList.lastAction(); + } var name = getUniqueName($(this).val()); if (name != $(this).val()) { FileList.checkName(name, $(this).val(), true); |