diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-30 15:28:53 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-30 15:28:53 -0800 |
| commit | cce2b08e6bcb16b1c9fde13b2597ce66fc0c45d6 (patch) | |
| tree | 8a00f81a913994f2fd952989e2519b1e893df5f2 /view/js | |
| parent | d59c1bb6bf36419344dc355113e56c2254cbcbfa (diff) | |
| download | volse-hubzilla-cce2b08e6bcb16b1c9fde13b2597ce66fc0c45d6.tar.gz volse-hubzilla-cce2b08e6bcb16b1c9fde13b2597ce66fc0c45d6.tar.bz2 volse-hubzilla-cce2b08e6bcb16b1c9fde13b2597ce66fc0c45d6.zip | |
progress on chunked uploads in /cloud
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/mod_cloud.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index e9e8e9241..2215a9df9 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -18,20 +18,21 @@ function UploadInit() { var submit = $("#upload-submit"); - $('#files-upload').fileupload({ + $('#invisible-cloud-file-upload').fileupload({ url: 'file_upload', dataType: 'json', dropZone: filedrag, + formData: $('#ajax-upload-files').serializeArray(), maxChunkSize: 100000, // 4 * 1024 * 1024, -// add: function(e,data) { -// data.submit(); -// }, - - submit: function(e,data) { - e.preventDefault(); + add: function(e,data) { + data.submit(); }, +// submit: function(e,data) { +// e.preventDefault(); +// }, + // done: function(e,data) { // addeditortext(data.result.message); // $('#jot-media').val($('#jot-media').val() + data.result.message); @@ -42,7 +43,7 @@ function UploadInit() { // }, }); -// $('#files-upload').click(function(event) { event.preventDefault(); $('#invisible-cloud-file-upload').trigger('click'); return false;}); + $('#upload-submit').click(function(event) { event.preventDefault(); $('#invisible-cloud-file-upload').trigger('click'); return false;}); @@ -190,7 +191,6 @@ function getIconFromType(type) { // upload files function UploadFile(file, idx) { - return; window.filesToUpload = window.filesToUpload + 1; |