Merge pull request #973 from protich/feature/retire-cannedresp-append

Retire canned response append checkbox on ticket reply.

Reviewed-By: Jared Hancock <jared@osticket.com>

include/staff/ticket-view.inc.php

@@ -515,8 +515,6 @@ $tcount+= $ticket->getNumNotes();
                             }
                             ?>
                         </select>
-                        &nbsp;&nbsp;&nbsp;
-                        <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>

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();
                     }