X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/75a21564a8d1d05009483f889815cee9c11dee01..620ae31539db55f2603d84fc78fb2ee471c8f403:/skins/fileupload.js diff --git a/skins/fileupload.js b/skins/fileupload.js index 75c6c6f..8e09907 100644 --- a/skins/fileupload.js +++ b/skins/fileupload.js @@ -9,12 +9,17 @@ DDFileUploader = function(dropbox, uploadUrl) { this.slideSize = 222; this.progressBarMaxSize = 200; // pixels this.thumbnailSize = 180; + this.previewQueue = []; + this._previewQueueRunning = false; + this.uploadQueue = []; + this._uploadQueueRunning = false; var self = this; addListener(dropbox, 'dragenter', function(evt){self.dragenter(evt);}); addListener(dropbox, 'dragover', function(evt){self.dragover(evt);}); addListener(dropbox, 'drop', function(evt){self.drop(evt);}); }; +// Drag and drop DDFileUploader.prototype.dragenter = function(evt) { disableDefault(evt); disablePropagation(evt); @@ -28,7 +33,6 @@ DDFileUploader.prototype.dragover = function(evt) { dt.dropEffect = 'copy'; }; - DDFileUploader.prototype.drop = function(evt) { disableDefault(evt); disablePropagation(evt); @@ -38,26 +42,117 @@ DDFileUploader.prototype.drop = function(evt) { this.handleFiles(dt.files); }; +// Methods about upload DDFileUploader.prototype.handleFiles = function(files) { - var file, i; + var file, i, slide; for (i = 0; i < files.length; i++) { file = files[i]; - this.createSlide(); - this.previewUploadedImage(file); - this.upload(file); + slide = this.createSlide(file); + this.previewQueuePush(slide); + this.uploadQueuePush(slide); + } +}; + +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); + req.setRequestHeader("Content-Type", file.type); + addListener(reader, 'load', + function(evt){ + console.info('load'); + try { + req.sendAsBinary(evt.target.result); + } + catch(e){} + }); + reader.readAsBinaryString(file); +}; + +DDFileUploader.prototype.uploadCompleteHandler = function(evt) { + var slide = this.uploadedSlide; + this.uploadedSlide.removeChild(slide.label); + this.uploadedSlide.removeChild(slide.label); + this.uploadQueueLoadNext(); +}; + +DDFileUploader.prototype.progressHandler = function(evt) { + if (evt.lengthComputable) { + var progress = evt.loaded / evt.total; + this.updateProgressBar(progress); + var currentOpacity = this.previewImg.style.opacity; + this.previewImg.style.opacity = Math.max(currentOpacity, progress); + } +}; + +// Method about queues + +DDFileUploader.prototype.previewQueuePush = function(slide) { + this.previewQueue.push(slide); + if (!this._previewQueueRunning) { + this.startPreviewQueue(); + } +}; + +DDFileUploader.prototype.startPreviewQueue = function() { + this._previewQueueRunning = true; + this.previewQueueLoadNext(); +}; + +DDFileUploader.prototype.previewQueueLoadNext = function() { + var slide = this.previewQueue.shift(); + if (slide) { + this.previewUploadedImage(slide); + } + else { + this._previewQueueRunning = false; + } +}; + +DDFileUploader.prototype.uploadQueuePush = function(slide) { + this.uploadQueue.push(slide); + if (!this._uploadQueueRunning) { + this.startUploadQueue(); } }; +DDFileUploader.prototype.startUploadQueue = function() { + this._uploadQueueRunning = true; + this.uploadQueueLoadNext(); +}; + -DDFileUploader.prototype.createSlide = function() { +DDFileUploader.prototype.uploadQueueLoadNext = function() { + var slide = this.uploadQueue.shift(); + if (slide) { + this.upload(slide); + } + else { + this._uploadQueueRunning = false; + } +}; + + +// User interface +DDFileUploader.prototype.createSlide = function(file) { var slide = document.createElement('span'); + slide.file = file; var a = document.createElement('a'); a.href = '#'; a.className = 'slide'; var img = document.createElement('img'); - this.previewImg = img; + img.className = 'hidden'; var size = this.thumbnailSize; var self = this; img.onload = function(evt) { @@ -71,17 +166,27 @@ DDFileUploader.prototype.createSlide = function() { } img.style.marginLeft = Math.round((self.slideSize - img.width) / 2) + 'px'; img.style.marginTop = Math.round((self.slideSize - img.height) / 2) + 'px'; + img.style.opacity = 0.2; img.className = undefined; }; 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'; + slide.progressBar = progressBar; slide.appendChild(a); slide.appendChild(progressBar); - this.progressBar = progressBar; + slide.appendChild(label); this.dropbox.appendChild(slide); + + return slide; }; DDFileUploader.prototype.updateProgressBar = function(progress) { @@ -89,51 +194,18 @@ DDFileUploader.prototype.updateProgressBar = function(progress) { var size = this.progressBarMaxSize * progress; size = Math.round(size); this.progressBar.style.width = size + 'px'; -} - - -DDFileUploader.prototype.upload = function(file) { - var reader = new FileReader(); - var req = new XMLHttpRequest(); - var self = this; - - addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);}); - addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);}); - - // req.upload.addEventListener("load", function(e){ - // self.ctrl.update(100); - // var canvas = self.ctrl.ctx.canvas; - // canvas.parentNode.removeChild(canvas); - // }, false); - req.open("PUT", this.uploadUrl + '/' + file.name); - req.setRequestHeader("Content-Type", file.type); - // req.overrideMimeType('text/plain; charset=x-user-defined-binary'); - reader.onload = function(evt) { - req.sendAsBinary(evt.target.result); - }; - reader.readAsBinaryString(file); -}; - -DDFileUploader.prototype.uploadCompleteHandler = function(evt) { - this.progressBar.parentNode.removeChild(this.progressBar); -}; - -DDFileUploader.prototype.progressHandler = function(evt) { - if (evt.lengthComputable) - this.updateProgressBar(evt.loaded / evt.total); }; -DDFileUploader.prototype.previewUploadedImage = function(file) { +DDFileUploader.prototype.previewUploadedImage = function(slide) { var reader = new FileReader(); - var img = this.previewImg; var size = this.thumbnailSize; - - img.className = 'hidden'; + var self = this; reader.onload = function(evt) { - img.src = evt.target.result; + slide.img.src = evt.target.result; + setTimeout(function(){self.previewQueueLoadNext();}, 500); }; - reader.readAsDataURL(file); + reader.readAsDataURL(slide.file); }; }());