From: Benoît Pin <pin@cri.ensmp.fr>
Date: Thu, 18 Aug 2011 12:46:13 +0000 (+0200)
Subject: On prépare de quoi se concentrer sur les images incorporées.
X-Git-Tag: 3.6.1~10
X-Git-Url: https://scm.cri.ensmp.fr/git/ckeditor.git/commitdiff_plain/78b572e10590a89824f0a804696f37af8760c913?hp=07784b9fcc5174d9d31afdd13d6921c82eaaabaf
On prépare de quoi se concentrer sur les images incorporées.
---
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 0efdcdd..8c0d171 100644
--- a/skins/ckeditor/plugins/plinn_image/dialog/embedded_images.html.pt
+++ b/skins/ckeditor/plugins/plinn_image/dialog/embedded_images.html.pt
@@ -57,12 +57,11 @@
<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 imagesPath = 'images/';
+ // var FCK = window.parent.FCK;
+ // var contentPath = FCK.Config.contentPath;
+ //
+ // var FCKConfig = window.parent.FCKConfig;
+ // var connUrl = FCKConfig.AttachmentBrowserConnectorUrl;
var slide_size = 222;
@@ -155,7 +154,7 @@
}
- addListener(window, 'load', _initBrowser);
+ //addListener(window, 'load', _initBrowser);
// -->
</script>
</head>
diff --git a/skins/ckeditor/plugins/plinn_image/dialog/plinn_image.html.pt b/skins/ckeditor/plugins/plinn_image/dialog/plinn_image.html.pt
index cc5dcf1..65b5a95 100644
--- a/skins/ckeditor/plugins/plinn_image/dialog/plinn_image.html.pt
+++ b/skins/ckeditor/plugins/plinn_image/dialog/plinn_image.html.pt
@@ -1 +1 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<title>Image selector</title>
<script type="text/javascript" language="javascript" charset="utf-8" src="epoz_script_detect.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="javascript_events_api.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="sarissa.js"></script>
<!--<script type="text/javascript" src="plinn_image.js"></script>-->
</head>
<frameset rows="27,*" border="0" frameborder="no" framespacing="0">
<frame name="tabs" src="about:blank" noresize="noresize" scrolling="no" />
<frame name="main" src="about:blank" />
<noframes><body></body></noframes>
</frameset>
</html>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<title>Image selector</title>
<script type="text/javascript" language="javascript" charset="utf-8" src="epoz_script_detect.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="javascript_events_api.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="sarissa.js"></script>
<script type="text/javascript" src="plinn_image.js"></script>
</head>
<frameset rows="27,*" border="0" frameborder="no" framespacing="0">
<frame name="tabs" src="about:blank" noresize="noresize" scrolling="no" />
<frame name="main" src="about:blank" />
<noframes><body></body></noframes>
</frameset>
</html>
\ No newline at end of file
diff --git a/skins/ckeditor/plugins/plinn_image/dialog/plinn_image.js b/skins/ckeditor/plugins/plinn_image/dialog/plinn_image.js
index 424024a..7962d13 100644
--- a/skins/ckeditor/plugins/plinn_image/dialog/plinn_image.js
+++ b/skins/ckeditor/plugins/plinn_image/dialog/plinn_image.js
@@ -3,20 +3,21 @@
// Licence GPL
var editor = window.dialogArguments.editor;
-var FCK = editor.FCK ;
-var FCKLang = editor.FCKLang ;
-var FCKConfig = editor.FCKConfig ;
-var FCKPlugins = editor.FCKPlugins;
-var FCKDebug = editor.FCKDebug ;
+var pluginPath = window.dialogArguments.pluginPath;
+//var FCK = editor.FCK ;
+//var FCKLang = editor.FCKLang ;
+//var FCKConfig = editor.FCKConfig ;
+//var FCKPlugins = editor.FCKPlugins;
+//var FCKDebug = editor.FCKDebug ;
window.onload = function() {
var mainFrame = window.frames['main'];
- mainFrame.src = FCKPlugins.Items['image'].Path + 'embedded_images.html';
+ mainFrame.src = pluginPath + 'dialog/embedded_images.html';
mainFrame.location.href = mainFrame.src;
var tabsFrame = window.frames['tabs'];
- tabsFrame.src = FCKPlugins.Items['image'].Path + 'plinn_image_tabs.html'
- tabsFrame.location.href = FCKPlugins.Items['image'].Path + 'plinn_image_tabs.html'
+ tabsFrame.src = pluginPath + 'dialog/plinn_image_tabs.html';
+ tabsFrame.location.href = tabsFrame.src;
}
function updateOrInsertImage(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 4beb51a..3a48d56 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
@@ -58,11 +58,11 @@
// <!--
var tabs = [];
function initTabs() {
- var FCKPlugins = window.parent.FCKPlugins;
+ var pluginPath = window.parent.pluginPath;
tabs = document.getElementsByTagName('a');
- tabs[0].href = FCKPlugins.Items['image'].Path + 'embedded_images.html';
- tabs[1].href = window.parent.FCKConfig.ImageBrowserURL;
+ tabs[0].href = pluginPath + 'dialog/embedded_images.html';
+ //tabs[1].href = window.parent.FCKConfig.ImageBrowserURL;
addListener(document, 'click', updateTabs)
};
addListener(window, 'load', initTabs);
diff --git a/skins/ckeditor/plugins/plinn_image/plugin.js b/skins/ckeditor/plugins/plinn_image/plugin.js
index 17658a9..df81531 100644
--- a/skins/ckeditor/plugins/plinn_image/plugin.js
+++ b/skins/ckeditor/plugins/plinn_image/plugin.js
@@ -34,6 +34,7 @@ function openPlinnImageDialog(path, editor) {
var win = open(path + 'dialog/plinn_image.html', 'PlinnImageDialog', winOptions);
win.dialogArguments = new Object();
win.dialogArguments.editor = editor;
+ win.dialogArguments.pluginPath = path;
}