// © 2013 Benoît Pin MINES ParisTech
-var DDFileUploader;
+var DDFileUploaderBase;
(function(){
+// nombre maximun d'image chargées en local
+var MAX_PREVIEW = 2;
-DDFileUploader = function(dropbox, uploadUrl) {
+DDFileUploaderBase = function(dropbox, uploadUrl) {
this.dropbox = dropbox;
this.uploadUrl = uploadUrl;
- this.slideSize = 222;
- this.progressBarMaxSize = 200; // pixels
- this.thumbnailSize = 180;
- this.previewQueue = [];
- this._previewQueueRunning = false;
this.uploadQueue = [];
this._uploadQueueRunning = false;
var self = this;
};
// Drag and drop
-DDFileUploader.prototype.dragenter = function(evt) {
+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);
dt.dropEffect = 'copy';
};
-DDFileUploader.prototype.drop = function(evt) {
+DDFileUploaderBase.prototype.drop = function(evt) {
disableDefault(evt);
disablePropagation(evt);
getEventObject(evt);
};
// 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];
slide = this.createSlide(file);
- this.previewQueuePush(slide);
- this.uploadQueuePush(slide);
+ this.previewQueuePush(slide);
+ this.uploadQueuePush(slide);
}
};
-DDFileUploader.prototype.upload = function(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.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
-
- req.open("PUT", this.uploadUrl + '/' + file.name);
+ addListener(req, 'readystatechange',
+ function(evt) {
+ if (req.readyState === 4) {
+ self.uploadCompleteHandler(req);
+ }
+ });
+
+ req.open("PUT", this.uploadUrl);
req.setRequestHeader("Content-Type", file.type);
- addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);});
+ req.setRequestHeader("X-File-Name", file.name);
+ addListener(reader, 'load',
+ function(evt){
+ try {
+ req.sendAsBinary(evt.target.result);
+ }
+ catch(e){}
+ });
reader.readAsBinaryString(file);
};
-DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
- this.progressBar.parentNode.removeChild(this.progressBar);
+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();
};
-DDFileUploader.prototype.progressHandler = function(evt) {
+DDFileUploaderBase.prototype.progressHandler = function(evt) {
if (evt.lengthComputable) {
var progress = evt.loaded / evt.total;
this.updateProgressBar(progress);
// Method about queues
-DDFileUploader.prototype.previewQueuePush = function(slide) {
+DDFileUploaderBase.prototype.previewQueuePush = function(slide) {
this.previewQueue.push(slide);
- if (!this._previewQueueRunning)
+ if (!this._previewQueueRunning) {
this.startPreviewQueue();
+ }
};
-DDFileUploader.prototype.startPreviewQueue = function() {
+DDFileUploaderBase.prototype.startPreviewQueue = function() {
this._previewQueueRunning = true;
this.previewQueueLoadNext();
};
-DDFileUploader.prototype.previewQueueLoadNext = function() {
- var slide = this.previewQueue.shift();
- if (slide)
+DDFileUploaderBase.prototype.previewQueueLoadNext = function() {
+ if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) {
+ var slide = this.previewQueue.shift();
this.previewUploadedImage(slide);
- else
+ this.previewsLoaded++;
+ }
+ else {
this._previewQueueRunning = false;
+ }
};
-DDFileUploader.prototype.uploadQueuePush = function(slide) {
+DDFileUploaderBase.prototype.uploadQueuePush = function(slide) {
this.uploadQueue.push(slide);
- if (!this._uploadQueueRunning)
+ if (!this._uploadQueueRunning) {
this.startUploadQueue();
+ }
};
-DDFileUploader.prototype.startUploadQueue = function() {
+DDFileUploaderBase.prototype.startUploadQueue = function() {
this._uploadQueueRunning = true;
this.uploadQueueLoadNext();
};
-DDFileUploader.prototype.uploadQueueLoadNext = function() {
+DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
var slide = this.uploadQueue.shift();
- if (slide)
+ if (slide) {
this.upload(slide);
- else
+ }
+ else {
this._uploadQueueRunning = false;
+ }
};
// User interface
-DDFileUploader.prototype.createSlide = function(file) {
+DDFileUploaderBase.prototype.createSlide = function(file) {
var slide = document.createElement('span');
slide.file = file;
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.appendChild(a);
slide.appendChild(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.previewUploadedImage = function(slide) {
+DDFileUploaderBase.prototype.previewUploadedImage = function(slide) {
var reader = new FileReader();
var size = this.thumbnailSize;
var self = this;
projects / Portfolio.git / blobdiff