aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-07-28 15:35:45 +0200
committerMario Vavti <mario@mariovavti.com>2016-07-28 15:35:45 +0200
commitfc105cf1415cf4124f69d40419b5c52307e993a2 (patch)
tree4d234a8bf4f5579fd010461eba7c7b776f04c914
parente65949f5947d38aff1ac8a5bb2abf682543dfc4f (diff)
downloadvolse-hubzilla-fc105cf1415cf4124f69d40419b5c52307e993a2.tar.gz
volse-hubzilla-fc105cf1415cf4124f69d40419b5c52307e993a2.tar.bz2
volse-hubzilla-fc105cf1415cf4124f69d40419b5c52307e993a2.zip
reusing the original form did not work so well via xhr upload - let us create a new form for this action. revert progressbar- only works nice in firefox
-rw-r--r--view/js/mod_cloud.js20
-rw-r--r--view/tpl/cloud_actionspanel.tpl2
2 files changed, 13 insertions, 9 deletions
diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js
index f7f9092c0..ea1ce35a7 100644
--- a/view/js/mod_cloud.js
+++ b/view/js/mod_cloud.js
@@ -22,6 +22,7 @@ function UploadInit() {
if (xhr.upload) {
// file select
+ fileselect.attr("multiple", 'multiple');
fileselect.on("change", UploadFileSelectHandler);
// file submit
@@ -64,27 +65,30 @@ function DragDropUploadFileSelectHandler(e) {
// file selection via input
function UploadFileSelectHandler(e) {
// fetch FileList object
- if(e.type === 'click') {
+ if(e.target.id === 'upload-submit') {
e.preventDefault();
var files = e.data[0].files;
}
- else {
+ if(e.target.id === 'files-upload') {
+ $('.new-upload').remove();
var files = e.target.files;
}
- $('.new-upload').remove();
+
// process all File objects
for (var i = 0, f; f = files[i]; i++) {
- prepareHtml(f, i);
- if(e.type === 'click')
+ if(e.target.id === 'files-upload')
+ prepareHtml(f, i);
+ if(e.target.id === 'upload-submit') {
UploadFile(f, i);
+ }
}
}
function prepareHtml(f, i) {
$("#cloud-index tr:nth-child(2)").after(
- '<tr id=\"new-upload-' + i + '\" class=\"new-upload\" style=\"background: url(\'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mOM2RFTDwAE2QHxFMHIIwAAAABJRU5ErkJggg==\') repeat-y; background-size: 3px;\">' +
+ '<tr class=\"new-upload\">' +
'<td><i class=\"fa ' + getIconFromType(f.type) + '\" title=\"' + f.type + '\"></i></td>' +
'<td>' + f.name + '</td>' +
'<td id=\"upload-progress-' + i + '\"></td><td></td><td></td><td></td><td></td>' +
@@ -182,8 +186,8 @@ function UploadFile(file, idx) {
// POST to the entire cloud path
xhr.open('post', window.location.pathname, true);
- var data = new FormData(document.getElementById("ajax-upload-files"));
-
+ var data = new FormData();
+ data.append('sabreAction', 'put');
data.append('file', file);
xhr.send(data);
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 8976b3007..eaa613dc4 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -13,7 +13,7 @@
<input type="hidden" name="sabreAction" value="put">
<label for="files-upload">{{$upload_header}}</label>
<div class="clear"></div>
- <input class="form-group pull-left" id="files-upload" type="file" name="file" multiple>
+ <input class="form-group pull-left" id="files-upload" type="file" name="file">
<button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
</form>
<div class="clear"></div>