X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/03d1ae20f7ed8f0767e5c3c2e367a8dde257483d..0cfb875cbacb607734f1a3c25fffcbe028c33fed:/skins/fileupload.js diff --git a/skins/fileupload.js b/skins/fileupload.js index 905ccf7..a67b3cf 100644 --- a/skins/fileupload.js +++ b/skins/fileupload.js @@ -64,8 +64,9 @@ DDFileUploader.prototype.upload = function(slide) { addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);}); addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);}); - req.open("PUT", this.uploadUrl + '/' + file.name); + req.open("PUT", this.uploadUrl); // + '/' + file.name); req.setRequestHeader("Content-Type", file.type); + req.setRequestHeader("X-File-Name", file.name); addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);}); reader.readAsBinaryString(file); }; @@ -88,8 +89,9 @@ DDFileUploader.prototype.progressHandler = function(evt) { DDFileUploader.prototype.previewQueuePush = function(slide) { this.previewQueue.push(slide); - if (!this._previewQueueRunning) + if (!this._previewQueueRunning) { this.startPreviewQueue(); + } }; DDFileUploader.prototype.startPreviewQueue = function() { @@ -99,16 +101,19 @@ DDFileUploader.prototype.startPreviewQueue = function() { DDFileUploader.prototype.previewQueueLoadNext = function() { var slide = this.previewQueue.shift(); - if (slide) + if (slide) { this.previewUploadedImage(slide); - else + } + else { this._previewQueueRunning = false; + } }; DDFileUploader.prototype.uploadQueuePush = function(slide) { this.uploadQueue.push(slide); - if (!this._uploadQueueRunning) + if (!this._uploadQueueRunning) { this.startUploadQueue(); + } }; DDFileUploader.prototype.startUploadQueue = function() { @@ -119,10 +124,12 @@ DDFileUploader.prototype.startUploadQueue = function() { DDFileUploader.prototype.uploadQueueLoadNext = function() { var slide = this.uploadQueue.shift(); - if (slide) + if (slide) { this.upload(slide); - else + } + else { this._uploadQueueRunning = false; + } };