X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/b7d8fdb29ecc041d5e987b9bba3c9d1206ab5b9a..98e7c46baa1b613b9b137c8478f99da593fdc46b:/skins/fileupload.js?ds=inline diff --git a/skins/fileupload.js b/skins/fileupload.js index 905ccf7..65a2984 100644 --- a/skins/fileupload.js +++ b/skins/fileupload.js @@ -2,6 +2,8 @@ var DDFileUploader; (function(){ +// nombre maximun d'image chargées en local +var MAX_PREVIEW = 5; DDFileUploader = function(dropbox, uploadUrl) { this.dropbox = dropbox; @@ -11,6 +13,7 @@ DDFileUploader = function(dropbox, uploadUrl) { this.thumbnailSize = 180; this.previewQueue = []; this._previewQueueRunning = false; + this.previewsLoaded = 0; this.uploadQueue = []; this._uploadQueueRunning = false; var self = this; @@ -48,8 +51,8 @@ DDFileUploader.prototype.handleFiles = function(files) { for (i = 0; i < files.length; i++) { file = files[i]; slide = this.createSlide(file); - this.previewQueuePush(slide); - this.uploadQueuePush(slide); + this.previewQueuePush(slide); + this.uploadQueuePush(slide); } }; @@ -57,21 +60,39 @@ DDFileUploader.prototype.upload = function(slide) { var reader = new FileReader(); var req = new XMLHttpRequest(); var file = slide.file; + this.uploadedSlide = slide; this.previewImg = slide.img; this.progressBar = slide.progressBar; var self = this; 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); + addListener(req, 'readystatechange', + function(evt) { + if (req.readyState === 4) { + self.uploadCompleteHandler(req); + } + }); + + req.open("PUT", this.uploadUrl); req.setRequestHeader("Content-Type", file.type); - addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);}); + req.setRequestHeader("X-File-Name", file.name); + addListener(reader, 'load', + function(evt){ + try { + req.sendAsBinary(evt.target.result); + } + catch(e){} + }); reader.readAsBinaryString(file); }; -DDFileUploader.prototype.uploadCompleteHandler = function(evt) { - this.progressBar.parentNode.removeChild(this.progressBar); +DDFileUploader.prototype.uploadCompleteHandler = function(req) { + var slide = this.uploadedSlide; + this.uploadedSlide.removeChild(slide.label); + this.uploadedSlide.removeChild(slide.progressBar); + slide.innerHTML = req.responseXML.documentElement.firstChild.data; + this.previewsLoaded--; + this.previewQueueLoadNext(); this.uploadQueueLoadNext(); }; @@ -88,8 +109,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() { @@ -98,17 +120,23 @@ DDFileUploader.prototype.startPreviewQueue = function() { }; DDFileUploader.prototype.previewQueueLoadNext = function() { - var slide = this.previewQueue.shift(); - if (slide) + if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) { + var slide = this.previewQueue.shift(); + console.info('previewQueueLoadNext', this.previewsLoaded, slide.file.name); this.previewUploadedImage(slide); - else + this.previewsLoaded++; + } + else { + console.warn('previewQueueLoadNext skipped', this.previewsLoaded); 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 +147,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; + } }; @@ -155,6 +185,11 @@ DDFileUploader.prototype.createSlide = function(file) { }; a.appendChild(img); slide.img = img; + + var label = document.createElement('span'); + slide.label = label; + label.className = 'label'; + label.innerHTML = file.name; var progressBar = document.createElement('span'); progressBar.className = 'upload-progress'; @@ -162,6 +197,7 @@ DDFileUploader.prototype.createSlide = function(file) { slide.appendChild(a); slide.appendChild(progressBar); + slide.appendChild(label); this.dropbox.appendChild(slide); return slide;