From e349db4b4acea93d208858e0ae600468dc12136e Mon Sep 17 00:00:00 2001
From: Peter <peter@moodle.com>
Date: Fri, 21 Jun 2019 08:11:52 +0800
Subject: [PATCH] MDL-65908 assign: Overflow and positioning updates

Draw all annotation within the drawing canvas instead of the region
---
 ...dle-assignfeedback_editpdf-editor-debug.js | Bin 155747 -> 155747 bytes
 ...oodle-assignfeedback_editpdf-editor-min.js | Bin 54250 -> 54250 bytes
 .../moodle-assignfeedback_editpdf-editor.js   | Bin 155747 -> 155747 bytes
 .../yui/src/editor/js/annotationstamp.js      |   4 ++--
 .../editpdf/yui/src/editor/js/comment.js      |   4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
index 0d6a4485a0bd8aa697b833ba63c9608d45586510..c71464d7b89ae53a35072740e0e5fb54d2d4442d 100644
GIT binary patch
delta 96
zcmaESfb;PI&JCB=O`qVw#5P@TH6zF5$gMil^%<E&r%OvR3QhLw;@E7xo|_4zfPJ&?
g#^>o+lunlWCBA)@Bx5KWSXuiwdB*ME<e73E0MHsDNdN!<

delta 92
zcmaESfb;PI&JCB=O}^mEHr<DpiDPoVnep@nUM9Zj(vplqll{6lHe0XfW&+CdZ4TM^
gARR*?|77`JV%uj)GKR8&6t(}AXWaf*o+-@%0E5mVg#Z8m

diff --git a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
index 4b467b2d3441714f1b26f88a5c4f4be98f6b17f1..cf66d1da719746f6fa3c210b08d81e93014aefcc 100644
GIT binary patch
delta 27
gcmaF0ocYyq<_&5llkc~(Z`L(gp$2B$iQ=mS0JazmfdBvi

delta 27
gcmaF0ocYyq<_&5llLIz!Y}PYbt_Eh@jpD5Y0IWp|zW@LL

diff --git a/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js b/mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
index 0d6a4485a0bd8aa697b833ba63c9608d45586510..c71464d7b89ae53a35072740e0e5fb54d2d4442d 100644
GIT binary patch
delta 96
zcmaESfb;PI&JCB=O`qVw#5P@TH6zF5$gMil^%<E&r%OvR3QhLw;@E7xo|_4zfPJ&?
g#^>o+lunlWCBA)@Bx5KWSXuiwdB*ME<e73E0MHsDNdN!<

delta 92
zcmaESfb;PI&JCB=O}^mEHr<DpiDPoVnep@nUM9Zj(vplqll{6lHe0XfW&+CdZ4TM^
gARR*?|77`JV%uj)GKR8&6t(}AXWaf*o+-@%0E5mVg#Z8m

diff --git a/mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js b/mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js
index 88161a66643..11356106944 100644
--- a/mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/annotationstamp.js
@@ -43,7 +43,7 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
      */
     draw: function() {
         var drawable = new M.assignfeedback_editpdf.drawable(this.editor),
-            drawingregion = this.editor.get_dialogue_element(SELECTOR.DRAWINGREGION),
+            drawingcanvas = this.editor.get_dialogue_element(SELECTOR.DRAWINGCANVAS),
             node,
             position;
 
@@ -59,7 +59,7 @@ Y.extend(ANNOTATIONSTAMP, M.assignfeedback_editpdf.annotation, {
             'zIndex': 50
         });
 
-        drawingregion.append(node);
+        drawingcanvas.append(node);
         node.setX(position.x);
         node.setY(position.y);
         drawable.store_position(node, position.x, position.y);
diff --git a/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js b/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
index 5fa232c4759..146f728d092 100644
--- a/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
@@ -160,7 +160,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
     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,
             label,
             marker,
@@ -203,7 +203,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
             color: COMMENTTEXTCOLOUR
         });
 
-        drawingregion.append(container);
+        drawingcanvas.append(container);
         container.setStyle('position', 'absolute');
         container.setX(position.x);
         container.setY(position.y);
-- 
2.17.1