Imported Upstream version 0.5.2+dfsg

[roundcube.git] / program / js / tiny_mce / themes / simple / editor_template_src.js

diff --git a/program/js/tiny_mce/themes/simple/editor_template_src.js b/program/js/tiny_mce/themes/simple/editor_template_src.js
index adc4492ab1d2f45d20ec5ee068e8b3faa4f47fb5..01ce87c58a9e25eb6cb8b3a0d331e8416099c5ee 100644 (file)
--- a/program/js/tiny_mce/themes/simple/editor_template_src.js
+++ b/program/js/tiny_mce/themes/simple/editor_template_src.js
@@ -1,11 +1,11 @@
 /**\r
- * $Id: editor_template_src.js 752 2008-03-27 21:51:25Z spocke $\r
+ * editor_template_src.js\r
  *\r
- * This file is meant to showcase how to create a simple theme. The advanced\r
- * theme is more suitable for production use.\r
+ * Copyright 2009, Moxiecode Systems AB\r
+ * Released under LGPL License.\r
  *\r
- * @author Moxiecode\r
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.\r
+ * License: http://tinymce.moxiecode.com/license\r
+ * Contributing: http://tinymce.moxiecode.com/contributing\r
  */\r
 \r
 (function() {\r
@@ -19,6 +19,7 @@
                        var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;\r
 \r
                        t.editor = ed;\r
+                       ed.contentCSS.push(url + "/skins/" + s.skin + "/content.css");\r
 \r
                        ed.onInit.add(function() {\r
                                ed.onNodeChange.add(function(ed, cm) {\r
@@ -26,11 +27,9 @@
                                                cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));\r
                                        });\r
                                });\r
-\r
-                               ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");\r
                        });\r
 \r
-                       DOM.loadCSS((s.editor_css ? ed.baseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");\r
+                       DOM.loadCSS((s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");\r
                },\r
 \r
                renderUI : function(o) {\r