diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php index efb27175820c84e57af2b7ae0f9ced7384196f9d..d0b1b34d757b858a64c83faab0fb1b28175aa8f8 100644 --- a/include/staff/ticket-view.inc.php +++ b/include/staff/ticket-view.inc.php @@ -515,8 +515,6 @@ $tcount+= $ticket->getNumNotes(); } ?> </select> - - <label><input type='checkbox' value='1' name="append" id="append" checked="checked"> Append</label> <br> <?php } @@ -539,7 +537,7 @@ $tcount+= $ticket->getNumNotes(); placeholder="Start writing your response here. Use canned responses from the drop-down above" data-draft-object-id="<?php echo $ticket->getId(); ?>" rows="9" wrap="soft" - class="richtext ifhtml draft"><?php + class="richtext ifhtml draft draft-delete"><?php echo $info['response']; ?></textarea> </td> </tr> @@ -647,7 +645,7 @@ $tcount+= $ticket->getNumNotes(); placeholder="Note details" rows="9" wrap="soft" data-draft-namespace="ticket.note" data-draft-object-id="<?php echo $ticket->getId(); ?>" - class="richtext ifhtml draft"><?php echo $info['note']; + class="richtext ifhtml draft draft-delete"><?php echo $info['note']; ?></textarea> <span class="error"><?php echo $errors['note']; ?></span> <br> diff --git a/scp/js/scp.js b/scp/js/scp.js index 24efdcab291c6a2711ebe2cdce89c7d3e6bd0350..294917b4d2795e86b6b1aa60eba6f5e70c201cd5 100644 --- a/scp/js/scp.js +++ b/scp/js/scp.js @@ -212,18 +212,11 @@ var scp_prep = function() { var box = $('#response',fObj), redactor = box.data('redactor'); if(canned.response) { - if($('#append',fObj).is(':checked') && $('#response',fObj).val()) { - if (redactor) - redactor.insertHtml(canned.response); - else - box.val(box.val() + canned.response); - } - else { - if (redactor) - redactor.set(canned.response); - else - box.val(canned.response); - } + if (redactor) + redactor.insertHtml(canned.response); + else + box.val(box.val() + canned.response); + if (redactor) redactor.observeStart(); }