From: Benoît Pin <pin@cri.ensmp.fr>
Date: Fri, 19 Aug 2011 10:57:06 +0000 (+0200)
Subject: Ça devrait le faire. Maintenant, on va passer au tests / ajustements.
X-Git-Tag: 3.6.1~6
X-Git-Url: https://scm.cri.mines-paristech.fr/git/ckeditor.git/commitdiff_plain/050cf4acaa2c233cc8d2452faeb5b51e3d10b5c9?ds=sidebyside

Ça devrait le faire. Maintenant, on va passer au tests / ajustements.
---

diff --git a/skins/ckeditor/config.js b/skins/ckeditor/config.js
index b9eb18c..58759ed 100644
--- a/skins/ckeditor/config.js
+++ b/skins/ckeditor/config.js
@@ -30,6 +30,7 @@ CKEDITOR.editorConfig = function( config )
 	config.contentsCss = CKEDITOR.basePath + 'global_plinn_style.css';
 	
 	config.filebrowserBrowseUrl = CKEDITOR.basePath + 'filemanager/browser/mac_finder/browser.html?Connector=connectors/plinn/connector';
+	CKEDITOR.config.filebrowserImageBrowseUrl = CKEDITOR.basePath + 'filemanager/browser/mac_finder/browser.html?Type=Image&Connector=connectors/plinn/connector';
 	config.filebrowserWindowHeight = 600;
 	config.filebrowserWindowWidth = 801;
 	config.attachmentBrowserConnectorUrl = CKEDITOR.basePath + 'plugins/plinn_image/connectors/plinn/connector';
diff --git a/skins/ckeditor/filemanager/browser/mac_finder/browser.html.dtml b/skins/ckeditor/filemanager/browser/mac_finder/browser.html.dtml
index f279157..1762c04 100644
--- a/skins/ckeditor/filemanager/browser/mac_finder/browser.html.dtml
+++ b/skins/ckeditor/filemanager/browser/mac_finder/browser.html.dtml
@@ -91,7 +91,7 @@
 		        return;
 		  }
 		  switch(window.parent.name) {
-	        case 'FCKeditorDialog_PlinnImage' :
+	        case 'PlinnImageDialog' :
 	            if (li.className == 'contentish-selected') {
 					        window.parent.updateOrInsertImage(li.link);
 					        window.close();
@@ -300,10 +300,9 @@
 					createLinkBtn.onclick = function(){
 					    var url = respDom.lastChild.firstChild.nodeValue;
 					    switch(window.parent.name) {
-					        case 'FCKeditorDialog_PlinnImage' :
+					        case 'PlinnImageDialog' :
     							    window.parent.updateOrInsertImage(url);
     							      break;
-    						  case 'FCKBrowseWindow' :
     						  default:
     						      var funcNum = GetUrlParam('CKEditorFuncNum');
     						      window.opener.CKEDITOR.tools.callFunction(funcNum, url);
diff --git a/skins/ckeditor/plugins/plinn_image/dialog/plinn_image_tabs.html.pt b/skins/ckeditor/plugins/plinn_image/dialog/plinn_image_tabs.html.pt
index 3a48d56..8afa5f0 100644
--- a/skins/ckeditor/plugins/plinn_image/dialog/plinn_image_tabs.html.pt
+++ b/skins/ckeditor/plugins/plinn_image/dialog/plinn_image_tabs.html.pt
@@ -62,7 +62,7 @@
 
 		    tabs = document.getElementsByTagName('a');
 		    tabs[0].href = pluginPath + 'dialog/embedded_images.html';
-		    //tabs[1].href = window.parent.FCKConfig.ImageBrowserURL;
+		    tabs[1].href = window.parent.editor.config.filebrowserImageBrowseUrl;
 		    addListener(document, 'click', updateTabs)
 		  };
 		  addListener(window, 'load', initTabs);