Refactoring en cours.

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 4061a0c8c8a800eee077b37941b2617b5a34f4cb..497e30ac2a618be595e0d7d21a7aa257a411f10e 100644 (file)
--- 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;
 (function(){
 // nombre maximun d'image chargées en local
 var MAX_PREVIEW = 2;

-var isThumbnail = /.*\/getThumbnail$/;

 
 DDFileUploaderBase = function(dropbox, uploadUrl) {
        this.dropbox = dropbox;
 
 DDFileUploaderBase = function(dropbox, uploadUrl) {
        this.dropbox = dropbox;

-       this.existingSlides = this.indexExistingSlides();

        this.uploadUrl = uploadUrl;
        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;
        this.uploadQueue = [];
        this._uploadQueueRunning = false;
        var self = this;


@@ -24,18 +16,6 @@ DDFileUploaderBase = function(dropbox, uploadUrl) {
        addListener(dropbox, 'drop', function(evt){self.drop(evt);});
 };
 
        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);
 // Drag and drop
 DDFileUploaderBase.prototype.dragenter = function(evt) {
        disableDefault(evt);

diff --git a/skins/portfolio_upload.js b/skins/portfolio_upload.js
index d38311077b3fddd0edbe862c7b80346e90622c1e..65915aa386f518494df6f51052f45383e2938794 100644 (file)
--- a/skins/portfolio_upload.js
+++ b/skins/portfolio_upload.js
@@ -3,10 +3,32 @@
 var DDImageUploader;
 
 (function(){
 var DDImageUploader;
 
 (function(){

+
+var isThumbnail = /.*\/getThumbnail$/;
+

 DDImageUploader = function(dropbox, uploadUrl) {
        DDFileUploaderBase.apply(this, [dropbox, uploadUrl]);
 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);
 
 };
 
 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
 }());
\ No newline at end of file