From 3cd718e8594cef29ce11fd9d00a9ed7dd9ba9093 Mon Sep 17 00:00:00 2001
From: Tony Butler <tonyjbutler@gmail.com>
Date: Thu, 6 Oct 2016 16:11:31 +0100
Subject: [PATCH] MDL-56324 assignfeedback_editpdf: Get current page no from
 page selector

When navigating to next/previous page or jumping to a comment
---
 ...dle-assignfeedback_editpdf-editor-debug.js | Bin 130833 -> 131124 bytes
 ...oodle-assignfeedback_editpdf-editor-min.js | Bin 45110 -> 45296 bytes
 .../moodle-assignfeedback_editpdf-editor.js   | Bin 130833 -> 131124 bytes
 .../yui/src/editor/js/commentsearch.js        |  10 +++++-----
 .../editpdf/yui/src/editor/js/editor.js       |   8 ++++++--
 5 files changed, 11 insertions(+), 7 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 1c32501397893ade5f52dba2ded64383e0096bee..bb1f48e5198d56cc88770a990e56b4e222c06f3b 100644
GIT binary patch
delta 343
zcmbREk9|u6N5d4xhtfJ+3P_+JF+H_7H77N>M8Q^J@@_ZP>Gp3Jxu?g!W8|J3b6Lzf
zH6^nozeq2+w5TXGuLPtTsIDNfs5sR#uS5f(TQ5DeL_@tSF{d<DT~kNF&_L6A>Q6=)
zM#br3jEt(&yBQhlrpH`o<eJXQ#ArUbqE2}7_cuk`FEcUbe&8!hECLz{bI0_FD;d=g
wu9(hwl#yrpgwKrZT0~i^psQeLJ>BsDqvZ6Q&y2sQY`8Ye@a>bnFxGPc02sn|tN;K2

delta 121
zcmdnez%lV3d&3mQhtp%38M!CNTo#+2d4Z8<`dmgvc1GLjOBoqeC!c%8F+GZjQGfc3
zwTzO}PcbsqO+NLC2O{)WmXT}vxwDMI+vhMb-v2P&`v4;kTR~!as;=&K#xIN_j0h2J
Q?dd=f`R%*DGFEW`0H>2H_5c6?

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 c0373e127a246ebbda4ace61b858b8f1a256cc9a..1c44310b92df509d502dfca1884d46996af543c8 100644
GIT binary patch
delta 311
zcmdn?fa$|SrVWK5EIOICMUyvni%mYij5pA_BqOs}FC#N0RYOy!NH4jxs3<kBq#!Xp
z)wUq9s5sR#uS6qLFFmzHL#Zq=r!-YbQ^(LiQzuUkq$Dq2(bg74lbYJ(!y)REUxw&T
zZm?C}Y!zC}!N@gvZLG#*on(>CuVT%`fn3E>waL9@oRg(W1U4s@T7ZOPJM|~^vTwf7
zV+-Q(E>WA@xI}ET*OH~IlQX6XO#WReJUM1Lj~>{uSlw8H;YMA<$xN%#$kwiHxVd`O
GZdL$NWO5P!

delta 172
zcmezHkZIckrVWK5YStwgnZ<e;nJK9nnmT!U1&QgYdHJ@swnci$rA0-lc_knb`^iF~
z+Kg6{Uxuhp77W#yTyLwgIU%%|WAecmsmbqR`53u2|B3Y$pDb9S24v=y28vI1?$iJ>
sU-SS)O_l&fCmYNb+gz|@DXXv!*hVDNb#*5ftxCfb*Vf)_x_UP&0KdpU5dZ)H

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 1c32501397893ade5f52dba2ded64383e0096bee..bb1f48e5198d56cc88770a990e56b4e222c06f3b 100644
GIT binary patch
delta 343
zcmbREk9|u6N5d4xhtfJ+3P_+JF+H_7H77N>M8Q^J@@_ZP>Gp3Jxu?g!W8|J3b6Lzf
zH6^nozeq2+w5TXGuLPtTsIDNfs5sR#uS5f(TQ5DeL_@tSF{d<DT~kNF&_L6A>Q6=)
zM#br3jEt(&yBQhlrpH`o<eJXQ#ArUbqE2}7_cuk`FEcUbe&8!hECLz{bI0_FD;d=g
wu9(hwl#yrpgwKrZT0~i^psQeLJ>BsDqvZ6Q&y2sQY`8Ye@a>bnFxGPc02sn|tN;K2

delta 121
zcmdnez%lV3d&3mQhtp%38M!CNTo#+2d4Z8<`dmgvc1GLjOBoqeC!c%8F+GZjQGfc3
zwTzO}PcbsqO+NLC2O{)WmXT}vxwDMI+vhMb-v2P&`v4;kTR~!as;=&K#xIN_j0h2J
Q?dd=f`R%*DGFEW`0H>2H_5c6?

diff --git a/mod/assign/feedback/editpdf/yui/src/editor/js/commentsearch.js b/mod/assign/feedback/editpdf/yui/src/editor/js/commentsearch.js
index 31d32341dbf..fc128923433 100644
--- a/mod/assign/feedback/editpdf/yui/src/editor/js/commentsearch.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/commentsearch.js
@@ -102,18 +102,18 @@ Y.extend(COMMENTSEARCH, M.core.dialogue, {
         e.preventDefault();
         var target = e.target.ancestor('li'),
             comment = target.getData('comment'),
-            editor = this.get('editor');
+            editor = this.get('editor'),
+            pageselect = editor.get_dialogue_element(SELECTOR.PAGESELECT);
 
         this.hide();
 
-        if (comment.pageno === editor.currentpage) {
-            comment.drawable.nodes[0].one('textarea').focus();
-        } else {
+        editor.currentpage = parseInt(pageselect.get('value'), 10);
+        if (comment.pageno !== editor.currentpage) {
             // Comment is on a different page.
             editor.currentpage = comment.pageno;
             editor.change_page();
-            comment.drawable.nodes[0].one('textarea').focus();
         }
+        comment.drawable.nodes[0].one('textarea').focus();
     },
 
     /**
diff --git a/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js b/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
index 2bdc486a9a8..7d0627a12c5 100644
--- a/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
+++ b/mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
@@ -1162,7 +1162,9 @@ EDITOR.prototype = {
      */
     previous_page: function(e) {
         e.preventDefault();
-        this.currentpage--;
+        var pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT);
+
+        this.currentpage = parseInt(pageselect.get('value'), 10) - 1;
         if (this.currentpage < 0) {
             this.currentpage = 0;
         }
@@ -1176,7 +1178,9 @@ EDITOR.prototype = {
      */
     next_page: function(e) {
         e.preventDefault();
-        this.currentpage++;
+        var pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT);
+
+        this.currentpage = parseInt(pageselect.get('value'), 10) + 1;
         if (this.currentpage >= this.pages.length) {
             this.currentpage = this.pages.length - 1;
         }
-- 
2.43.0