Replace TinyMCE with Summernote, round 1

summernote
Skylar Ittner 7 years ago
parent 4351cf46b7
commit 4baa85a8c5

@ -1847,22 +1847,15 @@ function hesk_printReplyForm()
<?php if ($modsForHesk_settings['rich_text_for_tickets']): ?> <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
tinyMCE.init({ $(document).ready(function() {
mode: "textareas", $('.htmlEditor').summernote({
editor_selector: "htmlEditor", height: 200,
elements: "content", toolbar: [
theme: "advanced", ['style', ['bold', 'italic', 'underline', 'clear']],
convert_urls: false, ['font', ['strikethrough', 'superscript', 'subscript']],
plugins: "autolink", ['para', ['ul', 'ol']]
]
theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull", });
theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
theme_advanced_buttons3: "",
theme_advanced_toolbar_location: "top",
theme_advanced_toolbar_align: "left",
theme_advanced_statusbar_location: "bottom",
theme_advanced_resizing: true
}); });
/* ]]> */ /* ]]> */
</script> </script>
@ -2138,8 +2131,8 @@ function hesk_printCanned()
if (document.getElementById) { if (document.getElementById) {
if (document.getElementById('moderep').checked) { if (document.getElementById('moderep').checked) {
if (isHtml) { if (isHtml) {
tinymce.get("message").setContent(''); $("#message").summernote('reset');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg); $("#message").summernote('editor.insertText', myMsg));
} else { } else {
myMsg = $('<textarea />').html(myMsg).text(); myMsg = $('<textarea />').html(myMsg).text();
$('#message').val(myMsg).trigger('input'); $('#message').val(myMsg).trigger('input');
@ -2147,9 +2140,9 @@ function hesk_printCanned()
} }
else { else {
if (isHtml) { if (isHtml) {
var oldMsg = tinymce.get("message").getContent(); var oldMsg = $("#message").val();
tinymce.get("message").setContent(''); $("#message").summernote('reset');
tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg); $("#message").summernote('editor.insertText', oldMsg + myMsg));
} else { } else {
var oldMsg = $('#message').val(); var oldMsg = $('#message').val();
var newMsg = $('<textarea />').html(oldMsg + '\n' + myMsg).text(); var newMsg = $('<textarea />').html(oldMsg + '\n' + myMsg).text();

@ -642,27 +642,20 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
buildValidatorForTicketSubmission('form1', "<?php echo addslashes($hesklang['select_at_least_one_value']); ?>"); buildValidatorForTicketSubmission('form1', "<?php echo addslashes($hesklang['select_at_least_one_value']); ?>");
</script> </script>
<?php if ($ticket['html']): ?> <?php if ($ticket['html']): ?>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
tinyMCE.init({ $(document).ready(function() {
mode: "textareas", $('.htmlEditor').summernote({
editor_selector: "htmlEditor", height: 200,
elements: "content", toolbar: [
theme: "advanced", ['style', ['bold', 'italic', 'underline', 'clear']],
convert_urls: false, ['font', ['strikethrough', 'superscript', 'subscript']],
plugins: "autolink", ['para', ['ul', 'ol']]
]
theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull", });
theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code", });
theme_advanced_buttons3: "", /* ]]> */
</script>
theme_advanced_toolbar_location: "top",
theme_advanced_toolbar_align: "left",
theme_advanced_statusbar_location: "bottom",
theme_advanced_resizing: true
});
/* ]]> */
</script>
<?php endif; ?> <?php endif; ?>
</section> </section>
</div> </div>
@ -679,4 +672,4 @@ function hesk_countAttachments($attachments_string) {
return count($att); return count($att);
} // END hesk_countAttachments() } // END hesk_countAttachments()

@ -74,9 +74,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
var msg = ''; var msg = '';
<?php <?php
if ($modsForHesk_settings['rich_text_for_tickets']) { ?> if ($modsForHesk_settings['rich_text_for_tickets']) { ?>
msg = tinymce.get("message").getContent(); msg = $('#message').val();
tinymce.get("message").setContent(''); $("#message").summernote('reset');
tinymce.get("message").execCommand('mceInsertRawHTML', false, msg + text_to_insert); $("#message").summernote('editor.insertText', msg + text_to_insert));
<?php } else { ?> <?php } else { ?>
msg = document.getElementById('message').value; msg = document.getElementById('message').value;
document.getElementById('message').value = msg + text_to_insert; document.getElementById('message').value = msg + text_to_insert;
@ -202,22 +202,15 @@ $num = hesk_dbNumRows($result);
<?php if ($modsForHesk_settings['rich_text_for_tickets']): ?> <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
tinyMCE.init({ $(document).ready(function() {
mode: "textareas", $('.htmlEditor').summernote({
editor_selector: "htmlEditor", height: 200,
elements: "content", toolbar: [
theme: "advanced", ['style', ['bold', 'italic', 'underline', 'clear']],
convert_urls: false, ['font', ['strikethrough', 'superscript', 'subscript']],
plugins: "autolink", ['para', ['ul', 'ol']]
]
theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull", });
theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
theme_advanced_buttons3: "",
theme_advanced_toolbar_location: "top",
theme_advanced_toolbar_align: "left",
theme_advanced_statusbar_location: "bottom",
theme_advanced_resizing: true
}); });
/* ]]> */ /* ]]> */
</script> </script>
@ -255,8 +248,7 @@ $num = hesk_dbNumRows($result);
if (myMsg == '') { if (myMsg == '') {
if (useHtmlEditor) { if (useHtmlEditor) {
tinymce.get("message").setContent(''); $("#message").summernote("reset");
tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
} }
else { else {
$('#message').val(''); $('#message').val('');
@ -266,8 +258,8 @@ $num = hesk_dbNumRows($result);
} }
if (document.getElementById) { if (document.getElementById) {
if (useHtmlEditor) { if (useHtmlEditor) {
tinymce.get("message").setContent(''); $("#message").summernote('reset');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg); $("#message").summernote('editor.insertText', myMsg));
} else { } else {
myMsg = $('<textarea />').html(myMsg).text(); myMsg = $('<textarea />').html(myMsg).text();
$('#message').val(myMsg).trigger('input'); $('#message').val(myMsg).trigger('input');

@ -39,26 +39,22 @@ if (isset($_POST['action'])) {
require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
if ($modsForHesk_settings['html_emails']) { if ($modsForHesk_settings['html_emails']) {
echo '<script type="text/javascript"> ?>
tinyMCE.init({ <script type="text/javascript">
mode : "textareas", /* <![CDATA[ */
editor_selector : "htmlEditor", $(document).ready(function() {
elements : "content", $('.htmlEditor').summernote({
theme : "advanced", height: 200,
convert_urls : false, toolbar: [
gecko_spellcheck: true, ['style', ['bold', 'italic', 'underline', 'clear']],
plugins: "autolink", ['font', ['strikethrough', 'superscript', 'subscript']],
['para', ['ul', 'ol']]
theme_advanced_buttons1 : "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull", ]
theme_advanced_buttons2 : "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code", });
theme_advanced_buttons3 : "", });
/* ]]> */
theme_advanced_toolbar_location : "top", </script>
theme_advanced_toolbar_align : "left", <?php
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true
});
</script>';
} }
/* Print main manage users page */ /* Print main manage users page */
@ -338,4 +334,4 @@ function getSpecialTagMap()
} }
return $map; return $map;
} }

@ -334,25 +334,20 @@ if (!isset($_SESSION['hide']['new_article']))
if ($hesk_settings['kb_wysiwyg']) if ($hesk_settings['kb_wysiwyg'])
{ {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
tinyMCE.init({ /* <![CDATA[ */
mode : "exact", $(document).ready(function() {
elements : "content", $('#content').summernote({
theme : "advanced", height: 200,
convert_urls : false, toolbar: [
gecko_spellcheck: true, ['style', ['bold', 'italic', 'underline', 'clear']],
plugins: "autolink", ['font', ['strikethrough', 'superscript', 'subscript']],
['para', ['ul', 'ol']]
theme_advanced_buttons1 : "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull", ]
theme_advanced_buttons2 : "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code", });
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true
}); });
</script> /* ]]> */
</script>
<?php <?php
} }
?> ?>

@ -286,22 +286,15 @@ $num = hesk_dbNumRows($result);
<?php if ($modsForHesk_settings['rich_text_for_tickets']): ?> <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
tinyMCE.init({ $(document).ready(function() {
mode: "textareas", $('.htmlEditor').summernote({
editor_selector: "htmlEditor", height: 200,
elements: "content", toolbar: [
theme: "advanced", ['style', ['bold', 'italic', 'underline', 'clear']],
convert_urls: false, ['font', ['strikethrough', 'superscript', 'subscript']],
plugins: "autolink", ['para', ['ul', 'ol']]
]
theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull", });
theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
theme_advanced_buttons3: "",
theme_advanced_toolbar_location: "top",
theme_advanced_toolbar_align: "left",
theme_advanced_statusbar_location: "bottom",
theme_advanced_resizing: true
}); });
/* ]]> */ /* ]]> */
</script> </script>
@ -326,8 +319,7 @@ $num = hesk_dbNumRows($result);
if (myMsg == '') { if (myMsg == '') {
if (useHtmlEditor) { if (useHtmlEditor) {
tinymce.get("message").setContent(''); $("#message").summernote('reset');
tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
} }
else { else {
$('#message').val(''); $('#message').val('');
@ -337,8 +329,8 @@ $num = hesk_dbNumRows($result);
} }
if (document.getElementById) { if (document.getElementById) {
if (useHtmlEditor) { if (useHtmlEditor) {
tinymce.get("message").setContent(''); $("#message").summernote('reset');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg); $("#message").summernote('editor.insertText', myMsg));
} else { } else {
myMsg = $('<textarea />').html(myMsg).text(); myMsg = $('<textarea />').html(myMsg).text();
$('#message').val(myMsg).trigger('input'); $('#message').val(myMsg).trigger('input');

@ -193,22 +193,15 @@ $show_quick_help = $show['show'];
<?php if ($modsForHesk_settings['rich_text_for_tickets']): ?> <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
tinyMCE.init({ $(document).ready(function() {
mode: "textareas", $('.htmlEditor').summernote({
editor_selector: "htmlEditor", height: 200,
elements: "content", toolbar: [
theme: "advanced", ['style', ['bold', 'italic', 'underline', 'clear']],
convert_urls: false, ['font', ['strikethrough', 'superscript', 'subscript']],
plugins: "autolink", ['para', ['ul', 'ol']]
]
theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull", });
theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
theme_advanced_buttons3: "",
theme_advanced_toolbar_location: "top",
theme_advanced_toolbar_align: "left",
theme_advanced_statusbar_location: "bottom",
theme_advanced_resizing: true
}); });
/* ]]> */ /* ]]> */
</script> </script>
@ -539,8 +532,7 @@ $show_quick_help = $show['show'];
if (myMsg == '') { if (myMsg == '') {
if (document.form1.mode[1].checked) { if (document.form1.mode[1].checked) {
if (useHtmlEditor) { if (useHtmlEditor) {
tinymce.get("message").setContent(''); $("#message").summernote('reset');
tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
} }
else { else {
$('#message').val(''); $('#message').val('');
@ -552,8 +544,8 @@ $show_quick_help = $show['show'];
if (document.getElementById) { if (document.getElementById) {
if (document.getElementById('moderep').checked) { if (document.getElementById('moderep').checked) {
if (useHtmlEditor) { if (useHtmlEditor) {
tinymce.get("message").setContent(''); $("#message").summernote('reset');
tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg); $("#message").summernote('editor.insertText', myMsg));
} else { } else {
myMsg = $('<textarea />').html(myMsg).text(); myMsg = $('<textarea />').html(myMsg).text();
$('#message').val(myMsg).trigger('input'); $('#message').val(myMsg).trigger('input');
@ -563,9 +555,9 @@ $show_quick_help = $show['show'];
} }
else { else {
if (useHtmlEditor) { if (useHtmlEditor) {
var oldMsg = tinymce.get("message").getContent(); var oldMsg = $("#message").val();
tinymce.get("message").setContent(''); $("#message").summernote('reset');
tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg); $("#message").summernote('editor.insertText', oldMsg + myMsg));
} else { } else {
var oldMsg = document.getElementById('message').value; var oldMsg = document.getElementById('message').value;
var theMsg = $('<textarea />').html(oldMsg + myMsg).text(); var theMsg = $('<textarea />').html(oldMsg + myMsg).text();
@ -998,8 +990,8 @@ if ($modsForHesk_settings['rich_text_for_tickets']) {
$message = hesk_SESSION('as_message', ''); $message = hesk_SESSION('as_message', '');
echo " echo "
<script> <script>
tinymce.get('message').setContent(''); $(\"#message\").summernote('reset');
tinymce.get('message').execCommand('mceInsertRawHTML', false, '".$message."'); $(\"#message\").summernote('editor.insertText', '".$message."'));
</script> </script>
"; ";
} }

@ -126,23 +126,18 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
if ($hesk_settings['kb_wysiwyg']) { if ($hesk_settings['kb_wysiwyg']) {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
tinyMCE.init({ /* <![CDATA[ */
mode: "exact", $(document).ready(function() {
elements: "content", $('#content').summernote({
theme: "advanced", height: 200,
convert_urls: false, toolbar: [
gecko_spellcheck: true, ['style', ['bold', 'italic', 'underline', 'clear']],
plugins: "autolink", ['font', ['strikethrough', 'superscript', 'subscript']],
['para', ['ul', 'ol']]
theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull", ]
theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code", });
theme_advanced_buttons3: "",
theme_advanced_toolbar_location: "top",
theme_advanced_toolbar_align: "left",
theme_advanced_statusbar_location: "bottom",
theme_advanced_resizing: true
}); });
/* ]]> */
</script> </script>
<?php <?php
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -173,10 +173,11 @@ if (is_dir(HESK_PATH . 'install')) {
<?php <?php
} }
/* If page requires WYSIWYG editor include TinyMCE Javascript */ /* If page requires WYSIWYG editor include Summernote Javascript and CSS */
if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg']) { if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg']) {
?> ?>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>inc/tiny_mce/3.5.11/tiny_mce.js"></script> <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/summernote.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/summernote.js"></script>
<?php <?php
} }

@ -185,10 +185,11 @@ $modsForHesk_settings = mfh_getSettings();
<?php <?php
} }
/* If page requires WYSIWYG editor include TinyMCE Javascript */ /* If page requires WYSIWYG editor include Summernote Javascript and CSS */
if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg']) { if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg']) {
?> ?>
<script type="text/javascript" src="<?php echo HESK_PATH; ?>inc/tiny_mce/3.5.11/tiny_mce.js"></script> <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/summernote.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
<script type="text/javascript" src="<?php echo HESK_PATH; ?>js/summernote.js"></script>
<?php <?php
} }

@ -693,12 +693,14 @@ function print_add_ticket()
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
$(document).ready(function() { $(document).ready(function() {
$('#message').summernote({height: 200, $('.htmlEditor').summernote({
toolbar: [ height: 200,
['style', ['bold', 'italic', 'underline', 'clear']], toolbar: [
['font', ['strikethrough', 'superscript', 'subscript']], ['style', ['bold', 'italic', 'underline', 'clear']],
['para', ['ul', 'ol']] ['font', ['strikethrough', 'superscript', 'subscript']],
]}); ['para', ['ul', 'ol']]
]
});
}); });
/* ]]> */ /* ]]> */
</script> </script>
@ -1592,4 +1594,4 @@ function has_public_kb($use_cache=1) {
return $hesk_settings['kb_enable']; return $hesk_settings['kb_enable'];
} // End has_public_kb() } // End has_public_kb()

Loading…
Cancel
Save