projects
/
Portfolio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Affichage / masquage de la cible du dépôt d'images.
[Portfolio.git]
/
skins
/
fileupload.js
diff --git
a/skins/fileupload.js
b/skins/fileupload.js
index
7229df9
..
980fb44
100644
(file)
--- a/
skins/fileupload.js
+++ b/
skins/fileupload.js
@@
-50,8
+50,6
@@
DDFileUploader.prototype.handleFiles = function(files) {
slide = this.createSlide(file);
this.previewQueuePush(slide);
this.uploadQueuePush(slide);
slide = this.createSlide(file);
this.previewQueuePush(slide);
this.uploadQueuePush(slide);
- // this.previewUploadedImage(file);
- // this.upload(file);
}
};
}
};
@@
-90,8
+88,9
@@
DDFileUploader.prototype.progressHandler = function(evt) {
DDFileUploader.prototype.previewQueuePush = function(slide) {
this.previewQueue.push(slide);
DDFileUploader.prototype.previewQueuePush = function(slide) {
this.previewQueue.push(slide);
- if (!this._previewQueueRunning)
+ if (!this._previewQueueRunning)
{
this.startPreviewQueue();
this.startPreviewQueue();
+ }
};
DDFileUploader.prototype.startPreviewQueue = function() {
};
DDFileUploader.prototype.startPreviewQueue = function() {
@@
-101,16
+100,19
@@
DDFileUploader.prototype.startPreviewQueue = function() {
DDFileUploader.prototype.previewQueueLoadNext = function() {
var slide = this.previewQueue.shift();
DDFileUploader.prototype.previewQueueLoadNext = function() {
var slide = this.previewQueue.shift();
- if (slide)
+ if (slide)
{
this.previewUploadedImage(slide);
this.previewUploadedImage(slide);
- else
+ }
+ else {
this._previewQueueRunning = false;
this._previewQueueRunning = false;
+ }
};
DDFileUploader.prototype.uploadQueuePush = function(slide) {
this.uploadQueue.push(slide);
};
DDFileUploader.prototype.uploadQueuePush = function(slide) {
this.uploadQueue.push(slide);
- if (!this._uploadQueueRunning)
+ if (!this._uploadQueueRunning)
{
this.startUploadQueue();
this.startUploadQueue();
+ }
};
DDFileUploader.prototype.startUploadQueue = function() {
};
DDFileUploader.prototype.startUploadQueue = function() {
@@
-121,10
+123,12
@@
DDFileUploader.prototype.startUploadQueue = function() {
DDFileUploader.prototype.uploadQueueLoadNext = function() {
var slide = this.uploadQueue.shift();
DDFileUploader.prototype.uploadQueueLoadNext = function() {
var slide = this.uploadQueue.shift();
- if (slide)
+ if (slide)
{
this.upload(slide);
this.upload(slide);
- else
+ }
+ else {
this._uploadQueueRunning = false;
this._uploadQueueRunning = false;
+ }
};
};
@@
-142,7
+146,6
@@
DDFileUploader.prototype.createSlide = function(file) {
var size = this.thumbnailSize;
var self = this;
img.onload = function(evt) {
var size = this.thumbnailSize;
var self = this;
img.onload = function(evt) {
- console.info('createSlide loaded.')
if (img.width > img.height) { // landscape
img.height = Math.round(size * img.height / img.width);
img.width = size;
if (img.width > img.height) { // landscape
img.height = Math.round(size * img.height / img.width);
img.width = size;
@@
-165,7
+168,6
@@
DDFileUploader.prototype.createSlide = function(file) {
slide.appendChild(a);
slide.appendChild(progressBar);
slide.appendChild(a);
slide.appendChild(progressBar);
- // this.progressBar = progressBar;
this.dropbox.appendChild(slide);
return slide;
this.dropbox.appendChild(slide);
return slide;
@@
-184,10
+186,8
@@
DDFileUploader.prototype.previewUploadedImage = function(slide) {
var self = this;
reader.onload = function(evt) {
var self = this;
reader.onload = function(evt) {
- console.info('previewUploadedImage loaded.')
slide.img.src = evt.target.result;
slide.img.src = evt.target.result;
- setTimeout(function(){self.previewQueueLoadNext();}, 1000);
- // self.previewQueueLoadNext();
+ setTimeout(function(){self.previewQueueLoadNext();}, 500);
};
reader.readAsDataURL(slide.file);
};
};
reader.readAsDataURL(slide.file);
};