From: Benoît Pin Date: Fri, 21 Jun 2013 09:37:32 +0000 (+0200) Subject: Refactoring, commentaires. X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/commitdiff_plain/8d51bb89a440ac0664586b9242ba550e7bfac0e4?hp=3c9883c2a062873c01d91e33b80facbf4ee9987f Refactoring, commentaires. --- diff --git a/skins/fileupload.js b/skins/fileupload.js index 6ee52d5..e467281 100644 --- a/skins/fileupload.js +++ b/skins/fileupload.js @@ -15,6 +15,7 @@ DDFileUploader = function(dropbox, uploadUrl) { addListener(dropbox, 'drop', function(evt){self.drop(evt);}); }; +// Drag and drop DDFileUploader.prototype.dragenter = function(evt) { disableDefault(evt); disablePropagation(evt); @@ -28,7 +29,6 @@ DDFileUploader.prototype.dragover = function(evt) { dt.dropEffect = 'copy'; }; - DDFileUploader.prototype.drop = function(evt) { disableDefault(evt); disablePropagation(evt); @@ -38,6 +38,7 @@ DDFileUploader.prototype.drop = function(evt) { this.handleFiles(dt.files); }; +// Methods about upload DDFileUploader.prototype.handleFiles = function(files) { var file, i; for (i = 0; i < files.length; i++) { @@ -48,7 +49,34 @@ DDFileUploader.prototype.handleFiles = function(files) { } }; +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.open("PUT", this.uploadUrl + '/' + file.name); + req.setRequestHeader("Content-Type", file.type); + addListener(reader, 'load', 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) { + var progress = evt.loaded / evt.total; + this.updateProgressBar(progress); + var currentOpacity = this.previewImg.style.opacity + this.previewImg.style.opacity = Math.max(currentOpacity, progress); + } +}; + +// User interface DDFileUploader.prototype.createSlide = function() { var slide = document.createElement('span'); @@ -71,6 +99,7 @@ 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); @@ -91,33 +120,6 @@ DDFileUploader.prototype.updateProgressBar = function(progress) { 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.open("PUT", this.uploadUrl + '/' + file.name); - req.setRequestHeader("Content-Type", file.type); - addListener(reader, 'load', 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) { - var progress = evt.loaded / evt.total; - this.updateProgressBar(progress); - this.previewImg.style.opacity=progress; - } -}; - DDFileUploader.prototype.previewUploadedImage = function(file) { var reader = new FileReader(); var img = this.previewImg;