From 5bc0ea5bd73e679cafabc73506584f9e29493529 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 13 Feb 2018 10:01:05 -0500 Subject: [PATCH] Bug 20190: TinyMCE is broken and not displayed Changes made by bug 12904 appear to have affected TinyMCE. Test plan: 1) Edit a library, note the OPAC info editor is missing 2) Apply this patch 3) Reload the page 4) The editor is back! Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt | 1 + 4 files changed, 4 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc index 0573daa168..1e23e9abeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc @@ -9,6 +9,7 @@ function wysiwyg_change (ed){ $(original_textarea).trigger("input"); } +tinyMCE.baseURL = "/intranet-tmpl/lib/tiny_mce"; tinyMCE.init({ setup : function(ed) { ed.onInit.add(function(editor){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 8890867206..6bbbc2f292 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -267,6 +267,7 @@ }); [% END %] }); + tinyMCE.baseURL = "/intranet-tmpl/lib/tiny_mce"; tinyMCE.init({ mode : "textareas", theme : "advanced", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt index e21be5d8ac..e99e1ca3b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt @@ -2,6 +2,7 @@ Online help