From 8eefbb2158c43b51a8c33e6c480cbe61539b9535 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 27 Aug 2012 04:16:04 -0400
Subject: [PATCH] Add option to enable HTML editor on forwarding (#1488517)
---
program/js/tiny_mce/themes/simple/editor_template_src.js | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
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 adc4492..01ce87c 100644
--- 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 @@
/**
- * $Id: editor_template_src.js 752 2008-03-27 21:51:25Z spocke $
+ * editor_template_src.js
*
- * This file is meant to showcase how to create a simple theme. The advanced
- * theme is more suitable for production use.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
*
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
*/
(function() {
@@ -19,6 +19,7 @@
var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;
t.editor = ed;
+ ed.contentCSS.push(url + "/skins/" + s.skin + "/content.css");
ed.onInit.add(function() {
ed.onNodeChange.add(function(ed, cm) {
@@ -26,11 +27,9 @@
cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));
});
});
-
- ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");
});
- DOM.loadCSS((s.editor_css ? ed.baseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");
+ DOM.loadCSS((s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");
},
renderUI : function(o) {
--
Gitblit v1.9.1