projects
/
Plinn.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e311b4c
)
Ré-introduction des images en preview local. Limitation du nombre d'images locales...
author
Benoît Pin
<pin@cri.ensmp.fr>
Tue, 23 Jul 2013 10:40:06 +0000
(12:40 +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
04fde67
..
65a2984
100644
(file)
--- a/
skins/fileupload.js
+++ b/
skins/fileupload.js
@@
-2,6
+2,8
@@
var DDFileUploader;
(function(){
var DDFileUploader;
(function(){
+// nombre maximun d'image chargées en local
+var MAX_PREVIEW = 5;
DDFileUploader = function(dropbox, uploadUrl) {
this.dropbox = dropbox;
DDFileUploader = function(dropbox, uploadUrl) {
this.dropbox = dropbox;
@@
-11,6
+13,7
@@
DDFileUploader = function(dropbox, uploadUrl) {
this.thumbnailSize = 180;
this.previewQueue = [];
this._previewQueueRunning = false;
this.thumbnailSize = 180;
this.previewQueue = [];
this._previewQueueRunning = false;
+ this.previewsLoaded = 0;
this.uploadQueue = [];
this._uploadQueueRunning = false;
var self = this;
this.uploadQueue = [];
this._uploadQueueRunning = false;
var self = this;
@@
-48,7
+51,7
@@
DDFileUploader.prototype.handleFiles = function(files) {
for (i = 0; i < files.length; i++) {
file = files[i];
slide = this.createSlide(file);
for (i = 0; i < files.length; i++) {
file = files[i];
slide = this.createSlide(file);
-
//
this.previewQueuePush(slide);
+ this.previewQueuePush(slide);
this.uploadQueuePush(slide);
}
};
this.uploadQueuePush(slide);
}
};
@@
-63,10
+66,9
@@
DDFileUploader.prototype.upload = function(slide) {
var self = this;
addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
var self = this;
addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
- // addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt, req);});
addListener(req, 'readystatechange',
function(evt) {
addListener(req, 'readystatechange',
function(evt) {
- if (req.readyState == 4) {
+ if (req.readyState ==
=
4) {
self.uploadCompleteHandler(req);
}
});
self.uploadCompleteHandler(req);
}
});
@@
-89,6
+91,8
@@
DDFileUploader.prototype.uploadCompleteHandler = function(req) {
this.uploadedSlide.removeChild(slide.label);
this.uploadedSlide.removeChild(slide.progressBar);
slide.innerHTML = req.responseXML.documentElement.firstChild.data;
this.uploadedSlide.removeChild(slide.label);
this.uploadedSlide.removeChild(slide.progressBar);
slide.innerHTML = req.responseXML.documentElement.firstChild.data;
+ this.previewsLoaded--;
+ this.previewQueueLoadNext();
this.uploadQueueLoadNext();
};
this.uploadQueueLoadNext();
};
@@
-116,11
+120,14
@@
DDFileUploader.prototype.startPreviewQueue = function() {
};
DDFileUploader.prototype.previewQueueLoadNext = function() {
};
DDFileUploader.prototype.previewQueueLoadNext = function() {
- var slide = this.previewQueue.shift();
- if (slide) {
+ if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) {
+ var slide = this.previewQueue.shift();
+ console.info('previewQueueLoadNext', this.previewsLoaded, slide.file.name);
this.previewUploadedImage(slide);
this.previewUploadedImage(slide);
+ this.previewsLoaded++;
}
else {
}
else {
+ console.warn('previewQueueLoadNext skipped', this.previewsLoaded);
this._previewQueueRunning = false;
}
};
this._previewQueueRunning = false;
}
};