Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle

diff --combined mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
index 2c4ef34,c4d943d..d872488
Binary files differ

diff --combined mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
index 2c4ef34,c4d943d..d872488
Binary files differ

diff --combined mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
index bf5d8a4,e3e3ac1..53f91c7
--- 1/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
--- 2/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
@@@ -159,7 -159,7 +159,7 @@@ var COMMENT = function(editor, gradeid
      this.draw = function(focus) {
          var drawable = new M.assignfeedback_editpdf.drawable(this.editor),
              node,
 -            drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION),
 +            drawingcanvas = this.editor.get_dialogue_element(SELECTOR.DRAWINGCANVAS),
              container,
              menu,
              position,
@@@ -189,14 -189,14 +189,14 @@@
              color: COMMENTTEXTCOLOUR
          });
  
 -        drawingregion.append(container);
 +        drawingcanvas.append(container);
          container.setStyle('position', 'absolute');
          container.setX(position.x);
          container.setY(position.y);
          drawable.store_position(container, position.x, position.y);
          drawable.nodes.push(container);
          node.set('value', this.rawtext);
-         scrollheight = node.get('scrollHeight'),
+         scrollheight = node.get('scrollHeight');
          node.setStyles({
              'height' : scrollheight + 'px',
              'overflow': 'hidden'