Commit e70cec10 authored by colemanw's avatar colemanw

Merge pull request #7993 from JKingsnorth/CRM-18257

[WIP] CRM-18257: WYSIWYG fullPage config option
parents 887babdd cb578dd4
......@@ -171,6 +171,7 @@ class CRM_Admin_Form_MessageTemplates extends CRM_Admin_Form {
'cols' => '80',
'rows' => '8',
'onkeyup' => "return verify(this)",
'class' => 'crm-wysiwyg-fullpage',
)
);
}
......
......@@ -14,6 +14,7 @@ Required vars: mailing
crm-ui-insert-rx="insert:body_html"
ng-model="mailing.body_html"
ng-blur="checkTokens(mailing, 'body_html', 'insert:body_html')"
class="crm-wysiwyg-fullpage"
></textarea>
<span ng-model="body_html_tokens" crm-ui-validate="hasAllTokens(mailing, 'body_html')"></span>
<div ng-show="htmlForm.$error.crmUiValidate" class="crmMailing-error-link">
......
......@@ -68,6 +68,8 @@
$(item).addClass('crm-wysiwyg-enabled');
var isFullPage = $(item).hasClass('crm-wysiwyg-fullpage');
CKEDITOR.replace($(item)[0], {
filebrowserBrowseUrl: browseUrl + '&type=files',
filebrowserImageBrowseUrl: browseUrl + '&type=images',
......@@ -76,6 +78,7 @@
filebrowserImageUploadUrl: uploadUrl + '&type=images',
filebrowserFlashUploadUrl: uploadUrl + '&type=flash',
allowedContent: true, // For CiviMail!
fullPage: isFullPage,
customConfig: CRM.config.CKEditorCustomConfig,
on: {
instanceReady: onReady
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment