X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/f9b11dd5e73b24997159b899b87e20fe70e44af3..4c96ff0638e92cdfb35c046c8614e157bfd8ffec:/skins/fileupload.js?ds=sidebyside
diff --git a/skins/fileupload.js b/skins/fileupload.js
index 42616a9..4061a0c 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -1,26 +1,48 @@
// © 2013 Benoît Pin MINES ParisTech
-var DDFileUploader;
+var DDFileUploaderBase;
(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.existingSlides = this.indexExistingSlides();
this.uploadUrl = uploadUrl;
this.slideSize = 222;
this.progressBarMaxSize = 200; // pixels
this.thumbnailSize = 180;
+ this.previewQueue = [];
+ this._previewQueueRunning = false;
+ this.previewsLoaded = 0;
+ 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);});
};
-DDFileUploader.prototype.dragenter = function(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
+DDFileUploaderBase.prototype.dragenter = function(evt) {
disableDefault(evt);
disablePropagation(evt);
};
-DDFileUploader.prototype.dragover = function(evt) {
+DDFileUploaderBase.prototype.dragover = function(evt) {
disableDefault(evt);
disablePropagation(evt);
evt = getEventObject(evt);
@@ -28,8 +50,7 @@ DDFileUploader.prototype.dragover = function(evt) {
dt.dropEffect = 'copy';
};
-
-DDFileUploader.prototype.drop = function(evt) {
+DDFileUploaderBase.prototype.drop = function(evt) {
disableDefault(evt);
disablePropagation(evt);
getEventObject(evt);
@@ -38,26 +59,148 @@ DDFileUploader.prototype.drop = function(evt) {
this.handleFiles(dt.files);
};
-DDFileUploader.prototype.handleFiles = function(files) {
- var file, i;
+// Methods about upload
+DDFileUploaderBase.prototype.handleFiles = function(files) {
+ var file, i, slide;
for (i = 0; i < files.length; i++) {
file = files[i];
- this.createSlide();
- this.previewUploadedImage(file);
- this.upload(file);
+ slide = this.createSlide(file);
+ this.previewQueuePush(slide);
+ this.uploadQueuePush(slide);
+ }
+};
+
+DDFileUploaderBase.prototype.upload = function(slide) {
+ var reader = new FileReader();
+ var req = new XMLHttpRequest();
+ var file = slide.file;
+ this.uploadedSlide = slide;
+ this.previewImg = slide.img;
+ this.progressBar = slide.progressBar;
+ var self = this;
+
+ 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);
+};
+
+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];
+ 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();
+};
+
+DDFileUploaderBase.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);
+ }
+};
+
+// Method about queues
+
+DDFileUploaderBase.prototype.previewQueuePush = function(slide) {
+ this.previewQueue.push(slide);
+ if (!this._previewQueueRunning) {
+ this.startPreviewQueue();
+ }
+};
+
+DDFileUploaderBase.prototype.startPreviewQueue = function() {
+ this._previewQueueRunning = true;
+ this.previewQueueLoadNext();
+};
+
+DDFileUploaderBase.prototype.previewQueueLoadNext = function() {
+ if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) {
+ var slide = this.previewQueue.shift();
+ this.previewUploadedImage(slide);
+ this.previewsLoaded++;
+ }
+ else {
+ this._previewQueueRunning = false;
+ }
+};
+
+DDFileUploaderBase.prototype.uploadQueuePush = function(slide) {
+ this.uploadQueue.push(slide);
+ if (!this._uploadQueueRunning) {
+ this.startUploadQueue();
+ }
+};
+
+DDFileUploaderBase.prototype.startUploadQueue = function() {
+ this._uploadQueueRunning = true;
+ this.uploadQueueLoadNext();
+};
+
+
+DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
+ var slide = this.uploadQueue.shift();
+ if (slide) {
+ this.upload(slide);
+ }
+ else {
+ this._uploadQueueRunning = false;
}
};
-DDFileUploader.prototype.createSlide = function() {
+// User interface
+DDFileUploaderBase.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');
- this.previewImg = img;
+ img.className = 'hidden';
var size = this.thumbnailSize;
var self = this;
img.onload = function(evt) {
@@ -69,69 +212,48 @@ DDFileUploader.prototype.createSlide = function() {
img.width = Math.round(size * img.width / img.height);
img.height = size;
}
- 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.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);
- this.progressBar = progressBar;
+ slide.appendChild(label);
this.dropbox.appendChild(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';
-}
-
-
-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) {
+DDFileUploaderBase.prototype.previewUploadedImage = function(slide) {
var reader = new FileReader();
- var img = this.previewImg;
var size = this.thumbnailSize;
-
- img.className = 'hidden';
+ var self = this;
reader.onload = function(evt) {
- img.src = evt.target.result;
+ slide.img.src = evt.target.result;
+ setTimeout(function(){self.previewQueueLoadNext();}, 500);
};
- reader.readAsDataURL(file);
+ reader.readAsDataURL(slide.file);
};
}());