5 files changed, 10 insertions, 12 deletions

diff --git a/public/javascripts/tiny_mce/plugins/preview/editor_plugin.js b/public/javascripts/tiny_mce/plugins/preview/editor_plugin.js
index deb4bce..507909c 100755..100644
--- a/public/javascripts/tiny_mce/plugins/preview/editor_plugin.js
+++ b/public/javascripts/tiny_mce/plugins/preview/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create('tinymce.plugins.Preview',{init:function(ed,url){var t=this,css=tinymce.explode(ed.settings.content_css);t.editor=ed;tinymce.each(css,function(u,k){css[k]=ed.documentBaseURI.toAbsolute(u);});ed.addCommand('mcePreview',function(){ed.windowManager.open({file:ed.getParam("plugin_preview_pageurl",url+"/preview.html"),width:parseInt(ed.getParam("plugin_preview_width","550")),height:parseInt(ed.getParam("plugin_preview_height","600")),resizable:"yes",scrollbars:"yes",popup_css:css.join(','),inline:ed.getParam("plugin_preview_inline",1)},{base:ed.documentBaseURI.getURI()});});ed.addButton('preview',{title:'preview.preview_desc',cmd:'mcePreview'});},getInfo:function(){return{longname:'Preview',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('preview',tinymce.plugins.Preview);})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Preview",{init:function(a,b){var d=this,c=tinymce.explode(a.settings.content_css);d.editor=a;tinymce.each(c,function(f,e){c[e]=a.documentBaseURI.toAbsolute(f)});a.addCommand("mcePreview",function(){a.windowManager.open({file:a.getParam("plugin_preview_pageurl",b+"/preview.html"),width:parseInt(a.getParam("plugin_preview_width","550")),height:parseInt(a.getParam("plugin_preview_height","600")),resizable:"yes",scrollbars:"yes",popup_css:c?c.join(","):a.baseURI.toAbsolute("themes/"+a.settings.theme+"/skins/"+a.settings.skin+"/content.css"),inline:a.getParam("plugin_preview_inline",1)},{base:a.documentBaseURI.getURI()})});a.addButton("preview",{title:"preview.preview_desc",cmd:"mcePreview"})},getInfo:function(){return{longname:"Preview",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("preview",tinymce.plugins.Preview)})();
\ No newline at end of file
diff --git a/public/javascripts/tiny_mce/plugins/preview/editor_plugin_src.js b/public/javascripts/tiny_mce/plugins/preview/editor_plugin_src.js
index b2d27f7..0582ab8 100755..100644
--- a/public/javascripts/tiny_mce/plugins/preview/editor_plugin_src.js
+++ b/public/javascripts/tiny_mce/plugins/preview/editor_plugin_src.js
@@ -1,5 +1,5 @@
 /**
- * $Id: editor_plugin_src.js 895 2008-07-10 14:34:23Z spocke $
+ * $Id: editor_plugin_src.js 1056 2009-03-13 12:47:03Z spocke $
  *
  * @author Moxiecode
  * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
@@ -24,7 +24,7 @@
                                         height : parseInt(ed.getParam("plugin_preview_height", "600")),
                                         resizable : "yes",
                                         scrollbars : "yes",
-                                        popup_css : css.join(','),
+                                        popup_css : css ? css.join(',') : ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css"),
                                         inline : ed.getParam("plugin_preview_inline", 1)
                                 }, {
                                         base : ed.documentBaseURI.getURI()
diff --git a/public/javascripts/tiny_mce/plugins/preview/example.html b/public/javascripts/tiny_mce/plugins/preview/example.html
index b2c3d90..b2c3d90 100755..100644
--- a/public/javascripts/tiny_mce/plugins/preview/example.html
+++ b/public/javascripts/tiny_mce/plugins/preview/example.html
diff --git a/public/javascripts/tiny_mce/plugins/preview/jscripts/embed.js b/public/javascripts/tiny_mce/plugins/preview/jscripts/embed.js
index f8dc810..f8dc810 100755..100644
--- a/public/javascripts/tiny_mce/plugins/preview/jscripts/embed.js
+++ b/public/javascripts/tiny_mce/plugins/preview/jscripts/embed.js
diff --git a/public/javascripts/tiny_mce/plugins/preview/preview.html b/public/javascripts/tiny_mce/plugins/preview/preview.html
index 7960f78..67e7b14 100755..100644
--- a/public/javascripts/tiny_mce/plugins/preview/preview.html
+++ b/public/javascripts/tiny_mce/plugins/preview/preview.html
@@ -1,19 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

 <html xmlns="http://www.w3.org/1999/xhtml">

 <head>

-<script language="javascript" src="../../tiny_mce_popup.js"></script>

+<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

 <script type="text/javascript" src="jscripts/embed.js"></script>

-<script type="text/javascript">

-tinyMCEPopup.onInit.add(function(ed) {

-        var dom = tinyMCEPopup.dom;

-

-        dom.setHTML('content', ed.getContent());

-});

-

+<script type="text/javascript"><!--

 document.write('<base href="' + tinyMCEPopup.getWindowArg("base") + '">');

+// -->

 </script>

 <title>{#preview.preview_desc}</title>

 </head>

 <body id="content">

-<!-- Gets filled with editor contents -->

+<script type="text/javascript">

+        document.write(tinyMCEPopup.editor.getContent());

+</script>

 </body>

 </html>