diff options
| author | friendica <info@friendica.com> | 2015-03-28 14:53:33 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-28 14:53:33 -0700 |
| commit | f35679dd6d606d9c9a31e9e807bd2aed8ba89641 (patch) | |
| tree | fc2ec97cec58c97f1237a8e1d2b47d8bfce7e589 /view/js/main.js | |
| parent | 0aba609ad408faabe72826a006b8af0fe15a3c2f (diff) | |
| parent | 2899c500eec19c8ad17b6819c33e0f0414bd1387 (diff) | |
| download | volse-hubzilla-f35679dd6d606d9c9a31e9e807bd2aed8ba89641.tar.gz volse-hubzilla-f35679dd6d606d9c9a31e9e807bd2aed8ba89641.tar.bz2 volse-hubzilla-f35679dd6d606d9c9a31e9e807bd2aed8ba89641.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/view/js/main.js b/view/js/main.js index 07035aee3..b9fb9f85e 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -275,7 +275,7 @@ $(function() { }); /* setup field_richtext */ - setupFieldRichtext(); + //setupFieldRichtext(); /* Turn elements with one of our special rel tags into popup menus */ @@ -1060,9 +1060,9 @@ function fcFileBrowser (field_name, url, type, win) { return false; } -function setupFieldRichtext(){ - return; /* +function setupFieldRichtext(){ + tinyMCE.init({ theme : "advanced", mode : "specific_textareas", @@ -1086,9 +1086,9 @@ function setupFieldRichtext(){ theme_advanced_path : false, file_browser_callback : "fcFileBrowser", }); -*/ -} +} +*/ /** * sprintf in javascript |