MDL-56324 assignfeedback_editpdf: Get current page no from page selector

When navigating to next/previous page or jumping to a comment

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

@@ -2298,18 +2298,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) {
+        editor.currentpage = parseInt(pageselect.get('value'), 10);
-            comment.drawable.nodes[0].one('textarea').focus();
+        if (comment.pageno !== editor.currentpage) {
-        } else {
             // 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();
     },
 
     /**
@@ -4253,7 +4253,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;
         }
@@ -4267,7 +4269,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;
         }

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

@@ -2298,18 +2298,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) {
+        editor.currentpage = parseInt(pageselect.get('value'), 10);
-            comment.drawable.nodes[0].one('textarea').focus();
+        if (comment.pageno !== editor.currentpage) {
-        } else {
             // 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();
     },
 
     /**
@@ -4253,7 +4253,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;
         }
@@ -4267,7 +4269,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;
         }

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) {
+        editor.currentpage = parseInt(pageselect.get('value'), 10);
-            comment.drawable.nodes[0].one('textarea').focus();
+        if (comment.pageno !== editor.currentpage) {
-        } else {
             // 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();
     },
 
     /**

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;
         }