From: Benoît Pin <pin@cri.ensmp.fr>
Date: Thu, 18 Aug 2011 14:51:39 +0000 (+0200)
Subject: l'upload des images attachées fonctionne !
X-Git-Tag: 3.6.1~9
X-Git-Url: https://svn.cri.ensmp.fr/git/ckeditor.git/commitdiff_plain/ff15447525986336e81f8bc423a23047c732bbe1

l'upload des images attachées fonctionne !
---

diff --git a/skins/ckeditor/config.js b/skins/ckeditor/config.js
index 2944bb0..322d3f2 100644
--- a/skins/ckeditor/config.js
+++ b/skins/ckeditor/config.js
@@ -32,6 +32,6 @@ CKEDITOR.editorConfig = function( config )
 	config.filebrowserBrowseUrl = CKEDITOR.basePath + 'filemanager/browser/mac_finder/browser.html?Connector=connectors/plinn/connector';
 	config.filebrowserWindowHeight = 600;
 	config.filebrowserWindowWidth = 801;
-	
-	config.extraPlugins = 'selection,plinn_image';
+	config.attachmentBrowserConnectorUrl = CKEDITOR.basePath + 'plugins/plinn_image/connectors/plinn/connector';
+	config.extraPlugins = 'plinn_image';
 };
\ No newline at end of file
diff --git a/skins/ckeditor/plugins/plinn_image/dialog/embedded_images.html.pt b/skins/ckeditor/plugins/plinn_image/dialog/embedded_images.html.pt
index 8c0d171..99e57aa 100644
--- a/skins/ckeditor/plugins/plinn_image/dialog/embedded_images.html.pt
+++ b/skins/ckeditor/plugins/plinn_image/dialog/embedded_images.html.pt
@@ -56,13 +56,17 @@
 		<script type="text/javascript" language="javascript" charset="utf-8" src="sarissa.js"></script>
 		<script type="text/javascript" language="javascript" charset="utf-8" src="DHTMLapi.js"></script>
 		<script type="text/javascript">
-		// <!--
+		<!--
 		// var FCK = window.parent.FCK;
 		// var contentPath = FCK.Config.contentPath;
     // 
 		// var FCKConfig = window.parent.FCKConfig;
 		// var connUrl = FCKConfig.AttachmentBrowserConnectorUrl;
 		
+		var editor = window.parent.editor;
+		var contentPath = editor.contentPath;
+		var connUrl = window.parent.editor.config.attachmentBrowserConnectorUrl;
+		
 		var slide_size = 222;
 		
 		function _initBrowser(){
@@ -154,7 +158,7 @@
 		  
 		}
 		
-		//addListener(window, 'load', _initBrowser);
+		addListener(window, 'load', _initBrowser);
 		// -->
 		</script>
 	</head>