Skip to content
Snippets Groups Projects
Commit 9ea936ef authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge branch 'develop' into 1.10.x

parents 852a8d08 dd7507ea
No related branches found
No related tags found
No related merge requests found
......@@ -291,7 +291,7 @@ $(function() {
var reset = $('input[type=reset]', el.closest('form'));
if (reset) {
reset.click(function() {
var file = $('.file');
var file = $('.file', el.closest('form'));
if (file)
file.remove();
if (el.attr('data-draft-id'))
......
......@@ -194,6 +194,11 @@ var scp_prep = function() {
});
$('form select#cannedResp').select2({width: '300px'});
$('form select#cannedResp').on('select2:opening', function (e) {
var redactor = $('.richtext', e.target.closest('form')).data('redactor');
if (redactor)
redactor.selection.save();
});
$('form select#cannedResp').change(function() {
......@@ -216,9 +221,10 @@ var scp_prep = function() {
var box = $('#response',fObj),
redactor = box.data('redactor');
if(canned.response) {
if (redactor)
if (redactor) {
redactor.selection.restore();
redactor.insert.html(canned.response);
else
} else
box.val(box.val() + canned.response);
if (redactor)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment