Introduction de la méthode « uploadCompleteHandlerCB ».

[Plinn.git] / skins / fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index d1da59e..bf36628 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -1,23 +1,26 @@
 // © 2013 Benoît Pin MINES ParisTech
 // © 2013 Benoît Pin MINES ParisTech

-var DDFileUploader;
+var DDFileUploaderBase;

 
 (function(){
 
 
 (function(){
 

-DDFileUploader = function(dropbox, uploadUrl) {
+DDFileUploaderBase = function(dropbox, uploadUrl) {

        this.dropbox = dropbox;
        this.uploadUrl = uploadUrl;
        this.dropbox = dropbox;
        this.uploadUrl = uploadUrl;

+       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);});
 };
 
        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);});
 };
 

-DDFileUploader.prototype.dragenter = function(evt) {
+// Drag and drop
+DDFileUploaderBase.prototype.dragenter = function(evt) {

        disableDefault(evt);
        disablePropagation(evt);
 };
 
        disableDefault(evt);
        disablePropagation(evt);
 };
 

-DDFileUploader.prototype.dragover = function(evt) {
+DDFileUploaderBase.prototype.dragover = function(evt) {

        disableDefault(evt);
        disablePropagation(evt);
        evt = getEventObject(evt);
        disableDefault(evt);
        disablePropagation(evt);
        evt = getEventObject(evt);


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

-
-DDFileUploader.prototype.drop = function(evt) {
+DDFileUploaderBase.prototype.drop = function(evt) {

        disableDefault(evt);
        disablePropagation(evt);
        getEventObject(evt);
        disableDefault(evt);
        disablePropagation(evt);
        getEventObject(evt);


@@ -35,41 +37,91 @@ DDFileUploader.prototype.drop = function(evt) {
        this.handleFiles(dt.files);
 };
 
        this.handleFiles(dt.files);
 };
 

-DDFileUploader.prototype.handleFiles = function(files) {
-       var file, i;
-       for (i = 0; i < files.length; i++) {
-               file = files[i];
-               console.log(file.type);
-               this.upload(file);
-       }
+// Methods about upload
+DDFileUploaderBase.prototype.handleFiles = function(files) {
+       // To be implemented by descendant.

 };
 
 
 };
 
 

-DDFileUploader.prototype.upload = function(file) {
+
+DDFileUploaderBase.prototype.beforeUpload = function(item) {
+       // To be implemented by decendant.
+};
+
+
+DDFileUploaderBase.prototype.upload = function(item) {
+       // item.file must be the file to be uploaded
+       this.beforeUpload(item);

        var reader = new FileReader();
        var reader = new FileReader();

-       var xhr = new XMLHttpRequest();
-       var percentage;
+       var req = new XMLHttpRequest();
+       var file = item.file;
+       

        var self = this;
        var self = this;

-       // this.xhr.upload.addEventListener("progress", function(e) {
-       //      if (e.lengthComputable) {
-       //              var percentage = Math.round((e.loaded * 100) / e.total);
-       //              self.ctrl.update(percentage);
-       //      }
-       // }, false);
-
-       // xhr.upload.addEventListener("load", function(e){
-       //   self.ctrl.update(100);
-       //   var canvas = self.ctrl.ctx.canvas;
-       //   canvas.parentNode.removeChild(canvas);
-       //  }, false);
-       console.log(file);
-       xhr.open("PUT", this.uploadUrl + '/' + file.name);
-       xhr.setRequestHeader("Content-Type", file.type);
-       // xhr.overrideMimeType('text/plain; charset=x-user-defined-binary');
-       reader.onload = function(evt) {
-               xhr.sendAsBinary(evt.target.result);
-       };
+       
+       addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
+       addListener(req, 'readystatechange',
+               function(evt) {
+                       if (req.readyState === 4) {
+                               self.uploadCompleteHandler(req);
+                       }
+               });
+
+       req.open("PUT", this.uploadUrl);
+       req.setRequestHeader("Content-Type", file.type);
+       req.setRequestHeader("X-File-Name", file.name);
+       addListener(reader, 'load',
+               function(evt){
+                       try {
+                               req.sendAsBinary(evt.target.result);
+                       }
+                       catch(e){}
+               });

        reader.readAsBinaryString(file);
 };
 
        reader.readAsBinaryString(file);
 };
 

+
+DDFileUploaderBase.prototype.uploadCompleteHandlerCB = function(req) {
+       // To be implemented by descendant.
+};
+
+DDFileUploaderBase.prototype.uploadCompleteHandler = function(req) {
+       this.uploadCompleteHandlerCB(req);
+       this.uploadQueueLoadNext();
+};
+
+DDFileUploaderBase.prototype.progressHandlerCB = function(progress) {
+       // To be implemented by descendant.
+       // 0 <= progress <= 1
+};
+
+DDFileUploaderBase.prototype.progressHandler = function(evt) {
+       if (evt.lengthComputable) {
+               var progress = evt.loaded / evt.total;
+               this.progressHandlerCB(progress);
+       }
+};
+
+// Methods about queue
+DDFileUploaderBase.prototype.uploadQueuePush = function(item) {
+       this.uploadQueue.push(item);
+       if (!this._uploadQueueRunning) {
+               this.startUploadQueue();
+       }
+};
+
+DDFileUploaderBase.prototype.startUploadQueue = function() {
+       this._uploadQueueRunning = true;
+       this.uploadQueueLoadNext();
+};
+
+DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
+       var item = this.uploadQueue.shift();
+       if (item) {
+               this.upload(item);
+       }
+       else {
+               this._uploadQueueRunning = false;
+       }
+};
+

 }());
 }());