Refactoring, commentaires.

[Plinn.git] / skins / fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 42616a9..e467281 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -15,6 +15,7 @@ DDFileUploader = function(dropbox, uploadUrl) {
        addListener(dropbox, 'drop', function(evt){self.drop(evt);});
 };
 
        addListener(dropbox, 'drop', function(evt){self.drop(evt);});
 };
 

+// Drag and drop

 DDFileUploader.prototype.dragenter = function(evt) {
        disableDefault(evt);
        disablePropagation(evt);
 DDFileUploader.prototype.dragenter = function(evt) {
        disableDefault(evt);
        disablePropagation(evt);


@@ -28,7 +29,6 @@ DDFileUploader.prototype.dragover = function(evt) {
        dt.dropEffect = 'copy';
 };
 
        dt.dropEffect = 'copy';
 };
 

-

 DDFileUploader.prototype.drop = function(evt) {
        disableDefault(evt);
        disablePropagation(evt);
 DDFileUploader.prototype.drop = function(evt) {
        disableDefault(evt);
        disablePropagation(evt);


@@ -38,6 +38,7 @@ DDFileUploader.prototype.drop = function(evt) {
        this.handleFiles(dt.files);
 };
 
        this.handleFiles(dt.files);
 };
 

+// Methods about upload

 DDFileUploader.prototype.handleFiles = function(files) {
        var file, i;
        for (i = 0; i < files.length; i++) {
 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');
 
 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.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);
                img.className = undefined;
        };
        a.appendChild(img);


@@ -89,36 +118,6 @@ DDFileUploader.prototype.updateProgressBar = function(progress) {
        var size = this.progressBarMaxSize * progress;
        size = Math.round(size);
        this.progressBar.style.width = size + 'px';
        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.open("PUT", this.uploadUrl + '/' + file.name);
-       req.setRequestHeader("Content-Type", file.type);
-       addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);})
-       // 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) {
-               var progress = evt.loaded / evt.total;
-               this.updateProgressBar(progress);
-               this.previewImg.style.opacity=progress;
-       }

 };
 
 DDFileUploader.prototype.previewUploadedImage = function(file) {
 };
 
 DDFileUploader.prototype.previewUploadedImage = function(file) {