aboutsummaryrefslogtreecommitdiff
path: root/mod/tinymce
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 22:25:02 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 22:25:02 +0000
commitbfb0a3e9b289e4036bfeb3e694586387fc4f904e (patch)
tree6beec05b6424702e036d67622db37ac6f8852a54 /mod/tinymce
parent1bd696b3d8eb8175cc2b6583716fe3e89110aab0 (diff)
downloadelgg-bfb0a3e9b289e4036bfeb3e694586387fc4f904e.tar.gz
elgg-bfb0a3e9b289e4036bfeb3e694586387fc4f904e.tar.bz2
Fixes #3091 adds load functions for js and css
git-svn-id: http://code.elgg.org/elgg/trunk@8675 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/tinymce')
-rw-r--r--mod/tinymce/start.php3
-rw-r--r--mod/tinymce/views/default/tinymce/init.php4
2 files changed, 5 insertions, 2 deletions
diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php
index 81667f8d5..1b641ff86 100644
--- a/mod/tinymce/start.php
+++ b/mod/tinymce/start.php
@@ -8,6 +8,9 @@
function tinymce_init() {
elgg_extend_view('css/elgg', 'tinymce/css');
elgg_extend_view('css/admin', 'tinymce/css');
+
+ elgg_register_js('tinymce', 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js');
+ elgg_register_js('elgg.tinymce', elgg_get_simplecache_url('js', 'tinymce'));
elgg_extend_view('input/longtext', 'tinymce/init');
diff --git a/mod/tinymce/views/default/tinymce/init.php b/mod/tinymce/views/default/tinymce/init.php
index 3fe08771c..35dd71613 100644
--- a/mod/tinymce/views/default/tinymce/init.php
+++ b/mod/tinymce/views/default/tinymce/init.php
@@ -3,5 +3,5 @@
* Initialize the TinyMCE script
*/
-elgg_register_js('tinymce', 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js');
-elgg_register_js('elgg.tinymce', elgg_get_simplecache_url('js', 'tinymce')); \ No newline at end of file
+elgg_load_js('tinymce');
+elgg_load_js('elgg.tinymce'); \ No newline at end of file