Merge pull request #34 from vetalball/fix-for-33

Fix #33. Move the file field to the end of form-data.
master
LianYue 9 years ago committed by GitHub
commit a179fda708

9
dist/example.js vendored

@ -1108,10 +1108,10 @@
},
_fileUploadHtml5: function _fileUploadHtml5(file) {
var form = new window.FormData();
form.append(this.name, file.file);
for (var key in file.data) {
form.append(key, file.data[key]);
}
form.append(this.name, file.file);
var xhr = new XMLHttpRequest();
xhr.open('POST', file.postAction);
this._fileUploadXhr(xhr, file, form);
@ -1147,7 +1147,6 @@
form.setAttribute('method', 'POST');
form.setAttribute('target', 'upload-iframe-' + file.id);
form.setAttribute('enctype', 'multipart/form-data');
form.appendChild(file.el);
for (var key in file.data) {
var input = document.createElement('input');
@ -1157,6 +1156,8 @@
form.appendChild(input);
}
form.appendChild(file.el);
var getDocumentData = function getDocumentData() {
var doc;
try {
@ -2576,8 +2577,8 @@
if(false) {
// When the styles change, update the <style> tags
if(!content.locals) {
module.hot.accept("!!./../node_modules/css-loader/index.js!./../node_modules/vue-loader/lib/style-rewriter.js?id=data-v-4563ebb1!./../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./FileUpload.vue", function() {
var newContent = require("!!./../node_modules/css-loader/index.js!./../node_modules/vue-loader/lib/style-rewriter.js?id=data-v-4563ebb1!./../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./FileUpload.vue");
module.hot.accept("!!./../node_modules/css-loader/index.js!./../node_modules/vue-loader/lib/style-rewriter.js?id=data-v-530f2599!./../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./FileUpload.vue", function() {
var newContent = require("!!./../node_modules/css-loader/index.js!./../node_modules/vue-loader/lib/style-rewriter.js?id=data-v-530f2599!./../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./FileUpload.vue");
if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];
update(newContent);
});

File diff suppressed because one or more lines are too long

@ -1119,10 +1119,10 @@ return /******/ (function(modules) { // webpackBootstrap
},
_fileUploadHtml5: function _fileUploadHtml5(file) {
var form = new window.FormData();
form.append(this.name, file.file);
for (var key in file.data) {
form.append(key, file.data[key]);
}
form.append(this.name, file.file);
var xhr = new XMLHttpRequest();
xhr.open('POST', file.postAction);
this._fileUploadXhr(xhr, file, form);
@ -1158,7 +1158,6 @@ return /******/ (function(modules) { // webpackBootstrap
form.setAttribute('method', 'POST');
form.setAttribute('target', 'upload-iframe-' + file.id);
form.setAttribute('enctype', 'multipart/form-data');
form.appendChild(file.el);
for (var key in file.data) {
var input = document.createElement('input');
@ -1168,6 +1167,8 @@ return /******/ (function(modules) { // webpackBootstrap
form.appendChild(input);
}
form.appendChild(file.el);
var getDocumentData = function getDocumentData() {
var doc;
try {
@ -2490,8 +2491,8 @@ return /******/ (function(modules) { // webpackBootstrap
if(false) {
// When the styles change, update the <style> tags
if(!content.locals) {
module.hot.accept("!!./../node_modules/css-loader/index.js!./../node_modules/vue-loader/lib/style-rewriter.js?id=data-v-4563ebb1!./../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./FileUpload.vue", function() {
var newContent = require("!!./../node_modules/css-loader/index.js!./../node_modules/vue-loader/lib/style-rewriter.js?id=data-v-4563ebb1!./../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./FileUpload.vue");
module.hot.accept("!!./../node_modules/css-loader/index.js!./../node_modules/vue-loader/lib/style-rewriter.js?id=data-v-530f2599!./../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./FileUpload.vue", function() {
var newContent = require("!!./../node_modules/css-loader/index.js!./../node_modules/vue-loader/lib/style-rewriter.js?id=data-v-530f2599!./../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./FileUpload.vue");
if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];
update(newContent);
});

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -547,10 +547,10 @@ export default {
_fileUploadHtml5(file) {
var form = new window.FormData();
form.append(this.name, file.file);
for (var key in file.data) {
form.append(key, file.data[key]);
}
form.append(this.name, file.file);
var xhr = new XMLHttpRequest();
xhr.open('POST', file.postAction);
this._fileUploadXhr(xhr, file, form);
@ -588,7 +588,6 @@ export default {
form.setAttribute('method', 'POST');
form.setAttribute('target', 'upload-iframe-' + file.id);
form.setAttribute('enctype', 'multipart/form-data');
form.appendChild(file.el);
for (let key in file.data) {
let input = document.createElement('input');
@ -598,6 +597,7 @@ export default {
form.appendChild(input);
}
form.appendChild(file.el);
var getDocumentData = function() {

Loading…
Cancel
Save