diff --git a/code/CMSMain.php b/code/CMSMain.php index c74f6ef6..d8388413 100644 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -92,7 +92,6 @@ 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(), @@ -100,6 +99,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr 'SpellcheckLangs' => '+' . implode(',', $spellcheckSpec) )); } + // Always block the HtmlEditorField.js otherwise it will be sent with an ajax request + Requirements::block(SAPPHIRE_DIR . '/javascript/HtmlEditorField.js'); Requirements::javascript(CMS_DIR . '/javascript/CMSMain.js'); Requirements::javascript(CMS_DIR . '/javascript/CMSMain_left.js'); diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php index b44a9b0a..c512b3d8 100755 --- a/code/ReportAdmin.php +++ b/code/ReportAdmin.php @@ -33,13 +33,14 @@ 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(), 'Lang' => i18n::get_tinymce_lang() )); } + // Always block the HtmlEditorField.js otherwise it will be sent with an ajax request + Requirements::block(SAPPHIRE_DIR . '/javascript/HtmlEditorField.js'); } /**