Début de refactoring du javascript pour rendre l'upload non spécifique à la photo.

[Plinn.git] / skins / fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 2b6c4a8..4061a0c 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -1,12 +1,14 @@
 // © 2013 Benoît Pin MINES ParisTech
 // © 2013 Benoît Pin MINES ParisTech

-var DDFileUploader;
+var DDFileUploaderBase;

 
 (function(){
 // nombre maximun d'image chargées en local
 var MAX_PREVIEW = 2;
 
 (function(){
 // nombre maximun d'image chargées en local
 var MAX_PREVIEW = 2;

+var isThumbnail = /.*\/getThumbnail$/;

 
 

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

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

+       this.existingSlides = this.indexExistingSlides();

        this.uploadUrl = uploadUrl;
        this.slideSize = 222;
        this.progressBarMaxSize = 200; // pixels
        this.uploadUrl = uploadUrl;
        this.slideSize = 222;
        this.progressBarMaxSize = 200; // pixels


@@ -22,13 +24,25 @@ DDFileUploader = function(dropbox, uploadUrl) {
        addListener(dropbox, 'drop', function(evt){self.drop(evt);});
 };
 
        addListener(dropbox, 'drop', function(evt){self.drop(evt);});
 };
 

+DDFileUploaderBase.prototype.indexExistingSlides = function() {
+       var images = this.dropbox.getElementsByTagName('img');
+       var i;
+       var index = [];
+       for (i=0 ; i < images.length ; i++) {
+               if (isThumbnail.test(images[i].src)) {
+                       index[images[i].src] = images[i];
+               }
+       }
+       return index;
+};
+

 // Drag and drop
 // Drag and drop

-DDFileUploader.prototype.dragenter = function(evt) {
+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);


@@ -36,7 +50,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);


@@ -46,7 +60,7 @@ DDFileUploader.prototype.drop = function(evt) {
 };
 
 // Methods about upload
 };
 
 // Methods about upload

-DDFileUploader.prototype.handleFiles = function(files) {
+DDFileUploaderBase.prototype.handleFiles = function(files) {

        var file, i, slide;
        for (i = 0; i < files.length; i++) {
                file = files[i];
        var file, i, slide;
        for (i = 0; i < files.length; i++) {
                file = files[i];


@@ -56,7 +70,7 @@ DDFileUploader.prototype.handleFiles = function(files) {
        }
 };
 
        }
 };
 

-DDFileUploader.prototype.upload = function(slide) {
+DDFileUploaderBase.prototype.upload = function(slide) {

        var reader = new FileReader();
        var req = new XMLHttpRequest();
        var file = slide.file;
        var reader = new FileReader();
        var req = new XMLHttpRequest();
        var file = slide.file;


@@ -86,21 +100,39 @@ DDFileUploader.prototype.upload = function(slide) {
        reader.readAsBinaryString(file);
 };
 
        reader.readAsBinaryString(file);
 };
 

-DDFileUploader.prototype.uploadCompleteHandler = function(req) {
+DDFileUploaderBase.prototype.uploadCompleteHandler = function(req) {

        var slide = this.uploadedSlide;
        this.uploadedSlide.removeChild(slide.label);
     this.uploadedSlide.removeChild(slide.progressBar);
        var fragment = getCopyOfNode(req.responseXML.documentElement.firstChild);
        var img = fragment.getElementsByTagName('img')[0];
        var slide = this.uploadedSlide;
        this.uploadedSlide.removeChild(slide.label);
     this.uploadedSlide.removeChild(slide.progressBar);
        var fragment = getCopyOfNode(req.responseXML.documentElement.firstChild);
        var img = fragment.getElementsByTagName('img')[0];

-       img.onload = function(evt) {
-               slide.parentNode.replaceChild(fragment, slide);
-       };
+       if (req.status === 200) {
+               // update
+               var existing = this.existingSlides[img.src];
+               if (existing) {
+                       existing.src = existing.src + '?' + Math.random().toString();
+               }
+               slide.img.src = '';
+               slide.img.parentNode.removeChild(slide.img);
+               slide.img = undefined;
+               slide.parentNode.removeChild(slide);
+       }
+       else if(req.status === 201) {
+               // creation
+               img.onload = function(evt) {
+                       // accelerate GC before replacing
+                       slide.img.src = '';
+                       slide.img.parentNode.removeChild(slide.img);
+                       slide.img = undefined;
+                       slide.parentNode.replaceChild(fragment, slide);
+               };
+       }

        this.previewsLoaded--;
        this.previewQueueLoadNext();
        this.uploadQueueLoadNext();
 };
 
        this.previewsLoaded--;
        this.previewQueueLoadNext();
        this.uploadQueueLoadNext();
 };
 

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

        if (evt.lengthComputable) {
                var progress = evt.loaded / evt.total;
                this.updateProgressBar(progress);
        if (evt.lengthComputable) {
                var progress = evt.loaded / evt.total;
                this.updateProgressBar(progress);


@@ -111,19 +143,19 @@ DDFileUploader.prototype.progressHandler = function(evt) {
 
 // Method about queues
 
 
 // Method about queues
 

-DDFileUploader.prototype.previewQueuePush = function(slide) {
+DDFileUploaderBase.prototype.previewQueuePush = function(slide) {

        this.previewQueue.push(slide);
        if (!this._previewQueueRunning) {
                this.startPreviewQueue();
        }
 };
 
        this.previewQueue.push(slide);
        if (!this._previewQueueRunning) {
                this.startPreviewQueue();
        }
 };
 

-DDFileUploader.prototype.startPreviewQueue = function() {
+DDFileUploaderBase.prototype.startPreviewQueue = function() {

        this._previewQueueRunning = true;
        this.previewQueueLoadNext();
 };
 
        this._previewQueueRunning = true;
        this.previewQueueLoadNext();
 };
 

-DDFileUploader.prototype.previewQueueLoadNext = function() {
+DDFileUploaderBase.prototype.previewQueueLoadNext = function() {

        if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) {
                var slide = this.previewQueue.shift();
                this.previewUploadedImage(slide);
        if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) {
                var slide = this.previewQueue.shift();
                this.previewUploadedImage(slide);


@@ -134,20 +166,20 @@ DDFileUploader.prototype.previewQueueLoadNext = function() {
        }
 };
 
        }
 };
 

-DDFileUploader.prototype.uploadQueuePush = function(slide) {
+DDFileUploaderBase.prototype.uploadQueuePush = function(slide) {

        this.uploadQueue.push(slide);
        if (!this._uploadQueueRunning) {
                this.startUploadQueue();
        }
 };
 
        this.uploadQueue.push(slide);
        if (!this._uploadQueueRunning) {
                this.startUploadQueue();
        }
 };
 

-DDFileUploader.prototype.startUploadQueue = function() {
+DDFileUploaderBase.prototype.startUploadQueue = function() {

        this._uploadQueueRunning = true;
        this.uploadQueueLoadNext();
 };
 
 
        this._uploadQueueRunning = true;
        this.uploadQueueLoadNext();
 };
 
 

-DDFileUploader.prototype.uploadQueueLoadNext = function() {
+DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {

        var slide = this.uploadQueue.shift();
        if (slide) {
                this.upload(slide);
        var slide = this.uploadQueue.shift();
        if (slide) {
                this.upload(slide);


@@ -159,7 +191,7 @@ DDFileUploader.prototype.uploadQueueLoadNext = function() {
 
 
 // User interface
 
 
 // User interface

-DDFileUploader.prototype.createSlide = function(file) {
+DDFileUploaderBase.prototype.createSlide = function(file) {

        var slide = document.createElement('span');
        slide.file = file;
 
        var slide = document.createElement('span');
        slide.file = file;
 


@@ -205,14 +237,14 @@ DDFileUploader.prototype.createSlide = function(file) {
        return slide;
 };
 
        return slide;
 };
 

-DDFileUploader.prototype.updateProgressBar = function(progress) {
+DDFileUploaderBase.prototype.updateProgressBar = function(progress) {

        // 0 <= progress <= 1
        var size = this.progressBarMaxSize * progress;
        size = Math.round(size);
        this.progressBar.style.width = size + 'px';
 };
 
        // 0 <= progress <= 1
        var size = this.progressBarMaxSize * progress;
        size = Math.round(size);
        this.progressBar.style.width = size + 'px';
 };
 

-DDFileUploader.prototype.previewUploadedImage = function(slide) {
+DDFileUploaderBase.prototype.previewUploadedImage = function(slide) {

        var reader = new FileReader();
        var size = this.thumbnailSize;
        var self = this;
        var reader = new FileReader();
        var size = this.thumbnailSize;
        var self = this;