Merge branch 'MDL-42482_editpdf_blank_comments' of git://github.com/davosmith/moodle

Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js

mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js

@@ -1928,6 +1928,8 @@ Y.extend(COMMENTMENU, M.assignfeedback_editpdf.dropdown, {
             commentlinks.all('.quicklist_comment').remove(true),
             comment = this.get('comment');
 
+        comment.deleteme = false; // Cancel the deleting of blank comments.
+
         // Now build the list of quicklist comments.
         Y.each(comment.editor.quicklist.comments, function(quickcomment) {
             var listitem = Y.Node.create('<li class="quicklist_comment"></li>'),

mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js

@@ -1928,6 +1928,8 @@ Y.extend(COMMENTMENU, M.assignfeedback_editpdf.dropdown, {
             commentlinks.all('.quicklist_comment').remove(true),
             comment = this.get('comment');
 
+        comment.deleteme = false; // Cancel the deleting of blank comments.
+
         // Now build the list of quicklist comments.
         Y.each(comment.editor.quicklist.comments, function(quickcomment) {
             var listitem = Y.Node.create('<li class="quicklist_comment"></li>'),

mod/assign/feedback/editpdf/yui/src/editor/js/commentmenu.js

@@ -70,6 +70,8 @@ Y.extend(COMMENTMENU, M.assignfeedback_editpdf.dropdown, {
             commentlinks.all('.quicklist_comment').remove(true),
             comment = this.get('comment');
 
+        comment.deleteme = false; // Cancel the deleting of blank comments.
+
         // Now build the list of quicklist comments.
         Y.each(comment.editor.quicklist.comments, function(quickcomment) {
             var listitem = Y.Node.create('<li class="quicklist_comment"></li>'),