Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolves #450 add id of component to sent form data #503

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Resolves #450 add id of component to sent form data #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
031e7e0
Resolves https://github.com/rowanwins/vue-dropzone/issues/450 add id …
england9911 Nov 2, 2019
4434161
Added senderid to a couple more vue emits
england9911 Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/vue2Dropzone.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
"dependencies": {
"dropzone": "^5.5.1"
}
}
}
37 changes: 20 additions & 17 deletions src/components/vue-dropzone.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export default {
return {
isS3: false,
isS3OverridesServerPropagation: false,
wasQueueAutoProcess: true
wasQueueAutoProcess: true,
senderId: null
};
},
computed: {
Expand Down Expand Up @@ -87,6 +88,7 @@ export default {
return;
}
this.hasBeenMounted = true;
this.senderId = this.id;

this.dropzone = new Dropzone(
this.$refs.dropzoneElement,
Expand Down Expand Up @@ -122,48 +124,48 @@ export default {
}
}

vm.$emit("vdropzone-file-added", file);
vm.$emit("vdropzone-file-added", file, vm.senderId);
if (vm.isS3 && vm.wasQueueAutoProcess && !file.manuallyAdded) {
vm.getSignedAndUploadToS3(file);
vm.getSignedAndUploadToS3(file, vm.senderId);
}
});

this.dropzone.on("addedfiles", function(files) {
vm.$emit("vdropzone-files-added", files);
vm.$emit("vdropzone-files-added", files, vm.senderId);
});

this.dropzone.on("removedfile", function(file) {
vm.$emit("vdropzone-removed-file", file);
vm.$emit("vdropzone-removed-file", file, vm.senderId);
if (file.manuallyAdded && vm.dropzone.options.maxFiles !== null)
vm.dropzone.options.maxFiles++;
});

this.dropzone.on("success", function(file, response) {
vm.$emit("vdropzone-success", file, response);
vm.$emit("vdropzone-success", file, response, vm.senderId);
if (vm.isS3) {
if (vm.isS3OverridesServerPropagation) {
var xmlResponse = new window.DOMParser().parseFromString(
response,
"text/xml"
);
var s3ObjectLocation = xmlResponse.firstChild.children[0].innerHTML;
vm.$emit("vdropzone-s3-upload-success", s3ObjectLocation);
vm.$emit("vdropzone-s3-upload-success", s3ObjectLocation, vm.senderId, file);
}
if (vm.wasQueueAutoProcess) vm.setOption("autoProcessQueue", false);
}
});

this.dropzone.on("successmultiple", function(file, response) {
vm.$emit("vdropzone-success-multiple", file, response);
vm.$emit("vdropzone-success-multiple", file, response, vm.senderId);
});

this.dropzone.on("error", function(file, message, xhr) {
vm.$emit("vdropzone-error", file, message, xhr);
vm.$emit("vdropzone-error", file, message, xhr, vm.senderId);
if (this.isS3) vm.$emit("vdropzone-s3-upload-error");
});

this.dropzone.on("errormultiple", function(files, message, xhr) {
vm.$emit("vdropzone-error-multiple", files, message, xhr);
vm.$emit("vdropzone-error-multiple", files, message, xhr, vm.senderId);
});

this.dropzone.on("sending", function(file, xhr, formData) {
Expand All @@ -177,11 +179,11 @@ export default {
formData.append("s3ObjectLocation", file.s3ObjectLocation);
}
}
vm.$emit("vdropzone-sending", file, xhr, formData);
vm.$emit("vdropzone-sending", file, xhr, formData, vm.senderId);
});

this.dropzone.on("sendingmultiple", function(file, xhr, formData) {
vm.$emit("vdropzone-sending-multiple", file, xhr, formData);
vm.$emit("vdropzone-sending-multiple", file, xhr, formData, vm.senderId);
});

this.dropzone.on("complete", function(file) {
Expand Down Expand Up @@ -317,7 +319,7 @@ export default {
let dropzoneEle = this.dropzone;
if (this.isS3 && !this.wasQueueAutoProcess) {
this.getQueuedFiles().forEach(file => {
this.getSignedAndUploadToS3(file);
this.getSignedAndUploadToS3(file, this.senderId);
});
} else {
this.dropzone.processQueue();
Expand Down Expand Up @@ -389,7 +391,7 @@ export default {
getActiveFiles: function() {
return this.dropzone.getActiveFiles();
},
getSignedAndUploadToS3(file) {
getSignedAndUploadToS3(file, componentid) {
var promise = awsEndpoint.sendFile(
file,
this.awss3,
Expand All @@ -400,14 +402,15 @@ export default {
if (response.success) {
file.s3ObjectLocation = response.message;
setTimeout(() => this.dropzone.processFile(file));
this.$emit("vdropzone-s3-upload-success", response.message);
this.$emit("vdropzone-s3-upload-success", response.message, componentid, file);
} else {
if ("undefined" !== typeof response.message) {
this.$emit("vdropzone-s3-upload-error", response.message);
this.$emit("vdropzone-s3-upload-error", response.message, componentid);
} else {
this.$emit(
"vdropzone-s3-upload-error",
"Network Error : Could not send request to AWS. (Maybe CORS error)"
"Network Error : Could not send request to AWS. (Maybe CORS error)",
componentid
);
}
}
Expand Down