mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-10-11 17:35:07 +01:00
commit 287a906645
5 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js vendored
View File

@ -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) {
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();
},
/**
@ -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;
}

10
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js vendored
View File

File diff suppressed because one or more lines are too long

18
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js vendored
View File

@ -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) {
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();
},
/**
@ -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;
}

10
mod/assign/feedback/editpdf/yui/src/editor/js/commentsearch.js vendored
View File

@ -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();
},
/**

8
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js vendored
View File

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