From b24c1dddb375574ffa52604f9f489995218bcaac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Tue, 13 Aug 2013 12:34:01 +0200 Subject: [PATCH 1/1] =?utf8?q?Introduction=20de=20la=20m=C3=A9thode=20?= =?utf8?q?=C2=AB=C2=A0uploadCompleteHandlerCB=C2=A0=C2=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- skins/fileupload.js | 34 ++++++---------------------------- skins/portfolio_upload.js | 32 +++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/skins/fileupload.js b/skins/fileupload.js index 318f059..bf36628 100644 --- a/skins/fileupload.js +++ b/skins/fileupload.js @@ -79,35 +79,13 @@ DDFileUploaderBase.prototype.upload = function(item) { reader.readAsBinaryString(file); }; + +DDFileUploaderBase.prototype.uploadCompleteHandlerCB = function(req) { + // To be implemented by descendant. +}; + DDFileUploaderBase.prototype.uploadCompleteHandler = function(req) { - var slide = this.uploadedSlide; - this.uploadedSlide.removeChild(slide.label); - this.uploadedSlide.removeChild(slide.progressBar); - var fragment = getCopyOfNode(req.responseXML.documentElement.firstChild); - var img = fragment.getElementsByTagName('img')[0]; - if (req.status === 200) { - // update - var existing = this.existingSlides[img.src]; - if (existing) { - existing.src = existing.src + '?' + Math.random().toString(); - } - slide.img.src = ''; - slide.img.parentNode.removeChild(slide.img); - slide.img = undefined; - slide.parentNode.removeChild(slide); - } - else if(req.status === 201) { - // creation - img.onload = function(evt) { - // accelerate GC before replacing - slide.img.src = ''; - slide.img.parentNode.removeChild(slide.img); - slide.img = undefined; - slide.parentNode.replaceChild(fragment, slide); - }; - } - this.previewsLoaded--; - this.previewQueueLoadNext(); + this.uploadCompleteHandlerCB(req); this.uploadQueueLoadNext(); }; diff --git a/skins/portfolio_upload.js b/skins/portfolio_upload.js index c9c492a..7dface3 100644 --- a/skins/portfolio_upload.js +++ b/skins/portfolio_upload.js @@ -1,7 +1,6 @@ // © 2013 Benoît Pin MINES ParisTech var DDImageUploader; -var MAX_PREVIEW = 2; // à virer (function(){ // nombre maximun d'image chargées en local @@ -50,6 +49,37 @@ DDImageUploader.prototype.beforeUpload = function(slide) { this.progressBar = slide.progressBar; }; +DDImageUploader.prototype.uploadCompleteHandlerCB = function(req) { + var slide = this.uploadedSlide; + this.uploadedSlide.removeChild(slide.label); + this.uploadedSlide.removeChild(slide.progressBar); + var fragment = getCopyOfNode(req.responseXML.documentElement.firstChild); + var img = fragment.getElementsByTagName('img')[0]; + if (req.status === 200) { + // update + var existing = this.existingSlides[img.src]; + if (existing) { + existing.src = existing.src + '?' + Math.random().toString(); + } + slide.img.src = ''; + slide.img.parentNode.removeChild(slide.img); + slide.img = undefined; + slide.parentNode.removeChild(slide); + } + else if(req.status === 201) { + // creation + img.onload = function(evt) { + // accelerate GC before replacing + slide.img.src = ''; + slide.img.parentNode.removeChild(slide.img); + slide.img = undefined; + slide.parentNode.replaceChild(fragment, slide); + }; + } + this.previewsLoaded--; + this.previewQueueLoadNext(); +}; + DDImageUploader.prototype.progressHandlerCB = function(progress) { this.updateProgressBar(progress); var currentOpacity = this.previewImg.style.opacity; -- 2.20.1