From: Benoît Pin Date: Fri, 2 Aug 2013 15:05:17 +0000 (+0200) Subject: Refactoring en cours. X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/commitdiff_plain/edfd67539f00f7719ddd0cc146d61bc49895e1d5 Refactoring en cours. --- diff --git a/skins/fileupload.js b/skins/fileupload.js index 4061a0c..497e30a 100644 --- a/skins/fileupload.js +++ b/skins/fileupload.js @@ -4,18 +4,10 @@ var DDFileUploaderBase; (function(){ // nombre maximun d'image chargées en local var MAX_PREVIEW = 2; -var isThumbnail = /.*\/getThumbnail$/; 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; @@ -24,18 +16,6 @@ DDFileUploaderBase = function(dropbox, uploadUrl) { addListener(dropbox, 'drop', function(evt){self.drop(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); diff --git a/skins/portfolio_upload.js b/skins/portfolio_upload.js index d383110..65915aa 100644 --- a/skins/portfolio_upload.js +++ b/skins/portfolio_upload.js @@ -3,10 +3,32 @@ var DDImageUploader; (function(){ + +var isThumbnail = /.*\/getThumbnail$/; + DDImageUploader = function(dropbox, uploadUrl) { DDFileUploaderBase.apply(this, [dropbox, uploadUrl]); + + this.existingSlides = this.indexExistingSlides(); + this.slideSize = 222; + this.progressBarMaxSize = 200; // pixels + this.thumbnailSize = 180; + this.previewQueue = []; + this._previewQueueRunning = false; + this.previewsLoaded = 0; }; copyPrototype(DDImageUploader, DDFileUploaderBase); +DDImageUploader.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; +}; + }()); \ No newline at end of file