projects
/
Plinn.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6f71934
)
Début de refactoring du javascript pour rendre l'upload non spécifique à la photo.
author
Benoît Pin
<pin@cri.ensmp.fr>
Fri, 2 Aug 2013 14:19:27 +0000
(16:19 +0200)
committer
Benoît Pin
<pin@cri.ensmp.fr>
Wed, 14 Aug 2013 10:33:12 +0000
(12:33 +0200)
skins/fileupload.js
patch
|
blob
|
history
diff --git
a/skins/fileupload.js
b/skins/fileupload.js
index
3f5f8c5
..
4061a0c
100644
(file)
--- a/
skins/fileupload.js
+++ b/
skins/fileupload.js
@@
-1,12
+1,12
@@
// © 2013 Benoît Pin MINES ParisTech
// © 2013 Benoît Pin MINES ParisTech
-var DDFileUploader;
+var DDFileUploader
Base
;
(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$/;
-DDFileUploader = function(dropbox, uploadUrl) {
+DDFileUploader
Base
= function(dropbox, uploadUrl) {
this.dropbox = dropbox;
this.existingSlides = this.indexExistingSlides();
this.uploadUrl = uploadUrl;
this.dropbox = dropbox;
this.existingSlides = this.indexExistingSlides();
this.uploadUrl = uploadUrl;
@@
-24,7
+24,7
@@
DDFileUploader = function(dropbox, uploadUrl) {
addListener(dropbox, 'drop', function(evt){self.drop(evt);});
};
addListener(dropbox, 'drop', function(evt){self.drop(evt);});
};
-DDFileUploader.prototype.indexExistingSlides = function() {
+DDFileUploader
Base
.prototype.indexExistingSlides = function() {
var images = this.dropbox.getElementsByTagName('img');
var i;
var index = [];
var images = this.dropbox.getElementsByTagName('img');
var i;
var index = [];
@@
-37,12
+37,12
@@
DDFileUploader.prototype.indexExistingSlides = function() {
};
// Drag and drop
};
// Drag and drop
-DDFileUploader.prototype.dragenter = function(evt) {
+DDFileUploader
Base
.prototype.dragenter = function(evt) {
disableDefault(evt);
disablePropagation(evt);
};
disableDefault(evt);
disablePropagation(evt);
};
-DDFileUploader.prototype.dragover = function(evt) {
+DDFileUploader
Base
.prototype.dragover = function(evt) {
disableDefault(evt);
disablePropagation(evt);
evt = getEventObject(evt);
disableDefault(evt);
disablePropagation(evt);
evt = getEventObject(evt);
@@
-50,7
+50,7
@@
DDFileUploader.prototype.dragover = function(evt) {
dt.dropEffect = 'copy';
};
dt.dropEffect = 'copy';
};
-DDFileUploader.prototype.drop = function(evt) {
+DDFileUploader
Base
.prototype.drop = function(evt) {
disableDefault(evt);
disablePropagation(evt);
getEventObject(evt);
disableDefault(evt);
disablePropagation(evt);
getEventObject(evt);
@@
-60,7
+60,7
@@
DDFileUploader.prototype.drop = function(evt) {
};
// Methods about upload
};
// Methods about upload
-DDFileUploader.prototype.handleFiles = function(files) {
+DDFileUploader
Base
.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];
@@
-70,7
+70,7
@@
DDFileUploader.prototype.handleFiles = function(files) {
}
};
}
};
-DDFileUploader.prototype.upload = function(slide) {
+DDFileUploader
Base
.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;
@@
-100,7
+100,7
@@
DDFileUploader.prototype.upload = function(slide) {
reader.readAsBinaryString(file);
};
reader.readAsBinaryString(file);
};
-DDFileUploader.prototype.uploadCompleteHandler = function(req) {
+DDFileUploader
Base
.prototype.uploadCompleteHandler = function(req) {
var slide = this.uploadedSlide;
this.uploadedSlide.removeChild(slide.label);
this.uploadedSlide.removeChild(slide.progressBar);
var slide = this.uploadedSlide;
this.uploadedSlide.removeChild(slide.label);
this.uploadedSlide.removeChild(slide.progressBar);
@@
-132,7
+132,7
@@
DDFileUploader.prototype.uploadCompleteHandler = function(req) {
this.uploadQueueLoadNext();
};
this.uploadQueueLoadNext();
};
-DDFileUploader.prototype.progressHandler = function(evt) {
+DDFileUploader
Base
.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);
@@
-143,19
+143,19
@@
DDFileUploader.prototype.progressHandler = function(evt) {
// Method about queues
// Method about queues
-DDFileUploader.prototype.previewQueuePush = function(slide) {
+DDFileUploader
Base
.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() {
+DDFileUploader
Base
.prototype.startPreviewQueue = function() {
this._previewQueueRunning = true;
this.previewQueueLoadNext();
};
this._previewQueueRunning = true;
this.previewQueueLoadNext();
};
-DDFileUploader.prototype.previewQueueLoadNext = function() {
+DDFileUploader
Base
.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);
@@
-166,20
+166,20
@@
DDFileUploader.prototype.previewQueueLoadNext = function() {
}
};
}
};
-DDFileUploader.prototype.uploadQueuePush = function(slide) {
+DDFileUploader
Base
.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() {
+DDFileUploader
Base
.prototype.startUploadQueue = function() {
this._uploadQueueRunning = true;
this.uploadQueueLoadNext();
};
this._uploadQueueRunning = true;
this.uploadQueueLoadNext();
};
-DDFileUploader.prototype.uploadQueueLoadNext = function() {
+DDFileUploader
Base
.prototype.uploadQueueLoadNext = function() {
var slide = this.uploadQueue.shift();
if (slide) {
this.upload(slide);
var slide = this.uploadQueue.shift();
if (slide) {
this.upload(slide);
@@
-191,7
+191,7
@@
DDFileUploader.prototype.uploadQueueLoadNext = function() {
// User interface
// User interface
-DDFileUploader.prototype.createSlide = function(file) {
+DDFileUploader
Base
.prototype.createSlide = function(file) {
var slide = document.createElement('span');
slide.file = file;
var slide = document.createElement('span');
slide.file = file;
@@
-237,14
+237,14
@@
DDFileUploader.prototype.createSlide = function(file) {
return slide;
};
return slide;
};
-DDFileUploader.prototype.updateProgressBar = function(progress) {
+DDFileUploader
Base
.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) {
+DDFileUploader
Base
.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;