diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-05 10:31:43 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-05 10:31:43 +0200 |
| commit | 03ddf8da8023b1f77559ac460c43df8d15e7afe5 (patch) | |
| tree | f186fb9d7dd2bf2a653fcf7ce04f3069806bd804 /apps/files/js | |
| parent | bbf8acb383bdcb1dcb53f4b9d5a8d894b17401df (diff) | |
| parent | fbedd643f7763531fbc8d671e259b82d8525e782 (diff) | |
| download | nextcloud-server-03ddf8da8023b1f77559ac460c43df8d15e7afe5.tar.gz nextcloud-server-03ddf8da8023b1f77559ac460c43df8d15e7afe5.zip | |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/file-upload.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index bd0ae4db00b..efd3c0d59ed 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -477,6 +477,7 @@ $(document).ready(function() { if ( document.getElementById('data-upload-form') ) { // initialize jquery fileupload (blueimp) var fileupload = $('#file_upload_start').fileupload(file_upload_param); + window.file_upload_param = fileupload; if(supportAjaxUploadWithProgress()) { @@ -747,5 +748,4 @@ $(document).ready(function() { }); }); - }); |