diff options
author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-22 12:50:02 +0100 |
---|---|---|
committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-22 12:50:02 +0100 |
commit | cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2 (patch) | |
tree | b88556dbafbabac5753bdec9e51fcb24ec4ca3b8 /library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js | |
parent | 29900febb341cfbec6e4445d4ea1c2dc782a521a (diff) | |
parent | 808180ce5f9471aa36faf8861fb84d04b412f412 (diff) | |
download | volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.gz volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.bz2 volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.zip |
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
boot.php
database.sql
include/template_processor.php
update.php
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js')
-rw-r--r--[-rwxr-xr-x] | library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js b/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js index 4b862d49d..01ce87c58 100755..100644 --- a/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js +++ b/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js @@ -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,8 +27,6 @@ cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));
});
});
-
- ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");
});
DOM.loadCSS((s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");
|