Optimisation du chargement des vignettes juxtaposées à celle affichée.

[Portfolio.git] / skins / portfolio_upload.js

diff --git a/skins/portfolio_upload.js b/skins/portfolio_upload.js
index 48bdf7f..87a70e4 100644 (file)
--- a/skins/portfolio_upload.js
+++ b/skins/portfolio_upload.js
@@ -1,20 +1,19 @@
 // © 2013 Benoît Pin MINES ParisTech
 
 var DDImageUploader;
 // © 2013 Benoît Pin MINES ParisTech
 
 var DDImageUploader;

-var MAX_PREVIEW = 2; // à virer

 
 (function(){
 // nombre maximun d'image chargées en local
 var MAX_PREVIEW = 2;
 var isThumbnail = /.*\/getThumbnail$/;
 
 
 (function(){
 // nombre maximun d'image chargées en local
 var MAX_PREVIEW = 2;
 var isThumbnail = /.*\/getThumbnail$/;
 

-DDImageUploader = function(dropbox, uploadUrl) {
+DDImageUploader = function(dropbox, uploadUrl, options) {

        DDFileUploaderBase.apply(this, [dropbox, uploadUrl]);
 
        this.existingSlides = this.indexExistingSlides();
        DDFileUploaderBase.apply(this, [dropbox, uploadUrl]);
 
        this.existingSlides = this.indexExistingSlides();

-       this.slideSize = 222;
-       this.progressBarMaxSize = 200; // pixels
-       this.thumbnailSize = 180;
+       this.slideSize = options.slideSize || 222; // pixels
+       this.progressBarMaxSize = this.slideSize - 22 || 200; 
+       this.thumbnailSize = options.thumbnailSize || 180;

        this.previewQueue = [];
        this._previewQueueRunning = false;
        this.previewsLoaded = 0;
        this.previewQueue = [];
        this._previewQueueRunning = false;
        this.previewsLoaded = 0;


@@ -44,6 +43,56 @@ DDImageUploader.prototype.handleFiles = function(files) {
        }
 };
 
        }
 };
 

+DDImageUploader.prototype.beforeUpload = function(slide) {
+       this.uploadedSlide = slide;
+       this.previewImg = slide.img;
+       this.progressBar = slide.progressBar;
+       this.scrollToSlide(slide);
+};
+
+DDImageUploader.prototype.scrollToSlide = function(slide) {
+       var slideHeight = slide.offsetHeight;
+       var slideOffsetTop = slide.getElementsByClassName('slide')[0].offsetTop;
+       var to = slideOffsetTop - getWindowHeight() + slideHeight;
+       window.scroll(0, to);
+};
+
+DDImageUploader.prototype.uploadCompleteHandlerCB = 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];
+       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();
+};
+
+DDImageUploader.prototype.progressHandlerCB = function(progress) {
+       this.updateProgressBar(progress);
+       var currentOpacity = this.previewImg.style.opacity;
+       this.previewImg.style.opacity = Math.max(currentOpacity, progress);
+};

 
 // Methods about preview queue.
 DDImageUploader.prototype.previewQueuePush = function(slide) {
 
 // Methods about preview queue.
 DDImageUploader.prototype.previewQueuePush = function(slide) {


@@ -69,6 +118,70 @@ DDImageUploader.prototype.previewQueueLoadNext = function() {
        }
 };
 
        }
 };
 

+// User interface
+DDImageUploader.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');
+       img.className = 'hidden';
+       var size = this.thumbnailSize;
+       var self = this;
+       img.onload = function(evt) {
+               if (img.width > img.height) { // landscape
+                       img.height = Math.round(size * img.height / img.width);
+                       img.width = size;
+               }
+               else {
+                       img.width = Math.round(size * img.width / img.height);
+                       img.height = size;
+               }
+               img.style.marginLeft = Math.floor((self.slideSize - img.width) / 2) + 'px';
+               img.style.marginTop = Math.floor((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);
+       slide.appendChild(label);
+       this.dropbox.appendChild(slide);
+       
+       return slide;
+};
+
+DDImageUploader.prototype.updateProgressBar = function(progress) {
+       // 0 <= progress <= 1
+       var size = this.progressBarMaxSize * progress;
+       size = Math.round(size);
+       this.progressBar.style.width = size + 'px';
+};
+
+DDImageUploader.prototype.previewUploadedImage = function(slide) {
+       var reader = new FileReader();
+       var size = this.thumbnailSize;
+       var self = this;
+       
+       reader.onload = function(evt) {
+               slide.img.src = evt.target.result;
+               setTimeout(function(){self.previewQueueLoadNext();}, 500);
+       };
+       reader.readAsDataURL(slide.file);
+};

 
 }());
\ No newline at end of file
 
 }());
\ No newline at end of file