X-Git-Url: https://svn.cri.ensmp.fr/git/ckeditor.git/blobdiff_plain/78b572e10590a89824f0a804696f37af8760c913..dd55f919fd97b1bdedb9b1465db672a11f916d2c:/skins/ckeditor/plugins/plinn_image/plugin.js

diff --git a/skins/ckeditor/plugins/plinn_image/plugin.js b/skins/ckeditor/plugins/plinn_image/plugin.js
index df81531..ebce6a9 100644
--- a/skins/ckeditor/plugins/plinn_image/plugin.js
+++ b/skins/ckeditor/plugins/plinn_image/plugin.js
@@ -35,6 +35,7 @@ function openPlinnImageDialog(path, editor) {
 	win.dialogArguments = new Object();
 	win.dialogArguments.editor = editor;
 	win.dialogArguments.pluginPath = path;
+	win.dialogArguments.CKEDITOR = CKEDITOR;
 }
 
 
@@ -48,27 +49,34 @@ CKEDITOR.plugins.add( 'plinn_image',
 		editor.on('instanceReady', function(){
 			editor.on('getData',
 				function(evt) {
-					var body = evt.editor.document.$.body;
-					var images = body.getElementsByTagName('IMG');
+					var tmpDiv = document.createElement('div');
+					tmpDiv.innerHTML = evt.data.dataValue;
+					var images = tmpDiv.getElementsByTagName('IMG');
 					for (var i = 0 ; i < images.length ; i++)
 						updateImageSizeUrlParameters(images[i]);
-					evt.data.dataValue = evt.editor.document.$.body.innerHTML;
+					evt.data.dataValue = tmpDiv.innerHTML;
 				}
 			);
 		});
 		var pluginPath = this.path;
+		var allowed = 'img[alt,!src]{border-style,border-width,float,height,margin,margin-bottom,margin-left,margin-right,margin-top,width}';
+		var required = 'img[alt,src]';
 		var command = editor.addCommand('plinn_image',
 			{
-				exec : function(editor){openPlinnImageDialog(pluginPath, editor);}
-			});
+				exec : function(editor){openPlinnImageDialog(pluginPath, editor);},
+				allowedContent: allowed,
+				requiredContent: required
+			}
+		);
 		
 		editor.ui.addButton('PlinnImage',
 			{
 				label : editor.lang.common.image,
-				icon : pluginPath + 'dialog/plinn_image.gif',
+				icon : pluginPath + 'dialog/plinn_image.png',
 				command : 'plinn_image'
 			});
 	}
+	
 });
 
 })();