From: Benoît Pin <pin@cri.ensmp.fr>
Date: Thu, 10 Apr 2014 09:49:49 +0000 (+0200)
Subject: bugfixes et cosmétique.
X-Git-Url: https://scm.cri.ensmp.fr/git/ckeditor.git/commitdiff_plain/3274cdd8815c89c1da0967c5e5fb0b3d8229b613

bugfixes et cosmétique.
---

diff --git a/skins/ckeditor/plugins/plinn_image/plugin.js b/skins/ckeditor/plugins/plinn_image/plugin.js
index 695d114..3e2606c 100644
--- a/skins/ckeditor/plugins/plinn_image/plugin.js
+++ b/skins/ckeditor/plugins/plinn_image/plugin.js
@@ -82,18 +82,25 @@ PlinnCKDDUploader.prototype.createImageProxy = function(file) {
 	img.setAttribute('height', 290);
 	img.setStyle('opacity', 0.2);
 	img.setAttribute('src', 'no_image.jpg');
+	img.placeholder = true;
 	var size = this.thumbnailSize;
+	var self = this;
 	
 	img.on('load', function(e) {
-		var img$ = img.$;
-		if (img$.width > img$.height) { // landscape
-			img$.height = Math.round(size * img$.height / img$.width);
+		if (e.sender.placeholder) {
+			e.sender.placeholder = false;
+			return;
+		};
+		var img$ = e.data.$.target;
+		if (img$.naturalWidth > img$.naturalHeight) { // landscape
+			img$.height = Math.round(size * img$.naturalHeight / img$.naturalWidth);
 			img$.width = size;
 		}
 		else {
-			img$.width = Math.round(size * img$.width / img$.height);
+			img$.width = Math.round(size * img$.naturalWidth / img$.naturalHeight);
 			img$.height = size;
 		}
+		self.progressBarMaxSize = img$.width;
 		img$.style.opacity = 0.2;
 	});
 	
@@ -184,6 +191,8 @@ PlinnCKDDUploader.prototype.uploadCompleteHandlerCB = function(req) {
 			img.setAttribute('width', data.getAttribute('width'));
 			img.setAttribute('height', data.getAttribute('height'));
 			img.replace(item.container);
+			this.previewsLoaded--;
+			this.previewQueueLoadNext();
 			break;
 	}
 };
@@ -272,7 +281,6 @@ PlinnCKDDUploader.prototype.previewUploadedImage = function(proxy) {
 	
 	reader.onload = function(evt) {
 		proxy.img.setAttribute('src', evt.target.result);
-		// proxy.img.src = evt.target.result;
 		setTimeout(function(){self.previewQueueLoadNext();}, 500);
 	};
 	reader.readAsDataURL(proxy.file);