Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jun 2016 18:05:13 +0000 (20:05 +0200)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:04 +0000 (09:04 +0100)
1  2 
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
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,
              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'