mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
BUGFIX: Updated CMS to support HtmlEditorField changes in r68701
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68702 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
aae16dc1f6
commit
45e34d4255
@ -92,6 +92,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
// We don't want this showing up in every ajax-response, it should always be present in a CMS-environment
|
||||
if(!Director::is_ajax()) {
|
||||
Requirements::javascript(MCE_ROOT . "tiny_mce_src.js");
|
||||
Requirements::block(SAPPHIRE_DIR . '/javascript/HtmlEditorField.js');
|
||||
Requirements::javascriptTemplate(CMS_DIR . "/javascript/tinymce.template.js", array(
|
||||
"ContentCSS" => (SSViewer::current_theme() ? THEMES_DIR . "/" . SSViewer::current_theme() : project()) . "/css/editor.css",
|
||||
"BaseURL" => Director::absoluteBaseURL(),
|
||||
|
@ -33,6 +33,7 @@ class ReportAdmin extends LeftAndMain {
|
||||
// always be present in a CMS environment
|
||||
if(!Director::is_ajax()) {
|
||||
Requirements::javascript(MCE_ROOT . "tiny_mce_src.js");
|
||||
Requirements::block(SAPPHIRE_DIR . '/javascript/HtmlEditorField.js');
|
||||
Requirements::javascriptTemplate(CMS_DIR . '/javascript/tinymce.template.js', array(
|
||||
'ContentCSS' => project() . '/css/editor.css',
|
||||
'BaseURL' => Director::absoluteBaseURL(),
|
||||
|
Loading…
Reference in New Issue
Block a user