aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorhubzilla <git@macgirvin.com>2016-07-27 14:54:51 +1000
committerGitHub <noreply@github.com>2016-07-27 14:54:51 +1000
commite286b510f1488b0fd529258a0d6159111fc4a2ef (patch)
treeff4ed6ac277adcd1ec3d6f6dbb4d8fe4eb1ded9a /view
parent315dafbe122829aedd80ede1db99d3e4e380dbf8 (diff)
parent7126fd4b313d60062e111c55fafbae47b9e53a68 (diff)
downloadvolse-hubzilla-e286b510f1488b0fd529258a0d6159111fc4a2ef.tar.gz
volse-hubzilla-e286b510f1488b0fd529258a0d6159111fc4a2ef.tar.bz2
volse-hubzilla-e286b510f1488b0fd529258a0d6159111fc4a2ef.zip
Merge pull request #463 from git-marijus/dev
allow multiple-file cloud upload
Diffstat (limited to 'view')
-rw-r--r--view/js/mod_cloud.js2
-rw-r--r--view/tpl/cloud_actionspanel.tpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js
index 71e916446..0584cec53 100644
--- a/view/js/mod_cloud.js
+++ b/view/js/mod_cloud.js
@@ -93,6 +93,6 @@ function DragDropUploadFile(file, idx) {
xhr.open('post', window.location.pathname, true);
var data = new FormData(document.getElementById("ajax-upload-files"));
- data.append('file', file);
+ data.append('file[]', file);
xhr.send(data);
}
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index acba965f2..9cdd73b31 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -18,7 +18,7 @@
<div class="clear"></div>
<label for="files-upload">{{$upload_header}}</label>
<div class="clear"></div>
- <input class="form-group pull-left" id="files-upload" type="file" name="file">
+ <input class="form-group pull-left" id="files-upload" type="file" name="file[]" multiple>
<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
</form>
<div class="clear"></div>