Skip to content

Commit e789c52

Browse files
committed
Conflicts resolved
2 parents 1eb2917 + 1f0972a commit e789c52

File tree

5 files changed

+23
-12
lines changed

5 files changed

+23
-12
lines changed

dev/bundle.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue2-dropzone.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/App.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<dropzone ref="myVueDropzone" id="dropzone" url="https://httpbin.org/post"
88
v-on:vdropzone-success="showSuccess"
99
v-bind:dropzone-options="dropzoneOptions"
10-
v-bind:max-number-of-files="1"
1110
v-bind:use-custom-dropzone-options="true">
1211
</dropzone>
12+
<button @click="submitFiles()">Start Upload</button>
1313
<button @click="process">Process</button>
1414
</div>
1515
</div>
@@ -26,7 +26,10 @@
2626
return {
2727
ok: true,
2828
dropzoneOptions: {
29-
autoProcessQueue: true,
29+
autoProcessQueue: false,
30+
uploadMultiple: true,
31+
parallelUploads: 1000,
32+
maxNumberOfFiles: 1000,
3033
},
3134
language: {
3235
dictDefaultMessage : 'Hi'
@@ -38,6 +41,9 @@
3841
console.log('im added');
3942
console.log(this.$refs.myVueDropzone)
4043
},
44+
'submitFiles': function () {
45+
this.$refs.myVueDropzone.processQueue()
46+
},
4147
'process': function () {
4248
console.log(this.$refs.myVueDropzone);
4349
// this.$refs.myVueDropzone.setOption('maxFiles', this.$refs.myVueDropzone.dropzone.options.maxFiles + 1)

src/index.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,11 @@
119119
duplicateCheck:{
120120
type: Boolean,
121121
default: false
122-
}
122+
},
123+
parallelUploads:{
124+
type : Number,
125+
default : 2
126+
},
123127
},
124128
methods: {
125129
manuallyAddFile: function (file, fileUrl, callback, crossOrigin, options) {
@@ -264,7 +268,8 @@
264268
resizeMimeType : this.getProp(this.resizeMimeType,this.dropzoneOptions.resizeMimeType),
265269
resizeQuality : this.getProp(this.resizeQuality,this.dropzoneOptions.resizeQuality),
266270
resizeMethod : this.getProp(this.resizeMethod,this.dropzoneOptions.resizeMethod),
267-
uploadMultiple : this.getProp(this.uploadMultiple, this.dropzoneOptions.uploadMultiple)
271+
uploadMultiple : this.getProp(this.uploadMultiple, this.dropzoneOptions.uploadMultiple),
272+
parallelUploads : this.getProp(this.parallelUploads, this.dropzoneOptions.parallelUploads),
268273
})
269274
270275
// Handle the dropzone events

0 commit comments

Comments
 (0)