L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-56324 assignfeedback_editpdf: Revert erroneous commits

Browse Source 
This reverts commits 88d309d and 3cd718e.
This commit is contained in:
Tony Butler
2017-03-17 11:04:04 +00:00
parent 80ff09db28
commit 9ac0280f80
5 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
Vendored
+7 -14
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'),
pageselect = editor.get_dialogue_element(SELECTOR.PAGESELECT);
editor = this.get('editor');
this.hide();
editor.currentpage = parseInt(pageselect.get('value'), 10);
if (comment.pageno !== editor.currentpage) {
if (comment.pageno === editor.currentpage) {
comment.drawable.nodes[0].one('textarea').focus();
} 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();
},
/**
@@ -4084,11 +4084,8 @@ EDITOR.prototype = {
*/
save_current_page: function() {
var ajaxurl = AJAXBASE,
pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT),
config;
this.currentpage = parseInt(pageselect.get('value'), 10);
config = {
method: 'post',
context: this,
@@ -4262,9 +4259,7 @@ EDITOR.prototype = {
*/
previous_page: function(e) {
e.preventDefault();
var pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT);
this.currentpage = parseInt(pageselect.get('value'), 10) - 1;
this.currentpage--;
if (this.currentpage < 0) {
this.currentpage = 0;
}
@@ -4278,9 +4273,7 @@ EDITOR.prototype = {
*/
next_page: function(e) {
e.preventDefault();
var pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT);
this.currentpage = parseInt(pageselect.get('value'), 10) + 1;
this.currentpage++;
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-min.js
Vendored
+5 -5
View File
File diff suppressed because one or more lines are too long
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
Vendored
+7 -14
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'),
pageselect = editor.get_dialogue_element(SELECTOR.PAGESELECT);
editor = this.get('editor');
this.hide();
editor.currentpage = parseInt(pageselect.get('value'), 10);
if (comment.pageno !== editor.currentpage) {
if (comment.pageno === editor.currentpage) {
comment.drawable.nodes[0].one('textarea').focus();
} 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();
},
/**
@@ -4084,11 +4084,8 @@ EDITOR.prototype = {
*/
save_current_page: function() {
var ajaxurl = AJAXBASE,
pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT),
config;
this.currentpage = parseInt(pageselect.get('value'), 10);
config = {
method: 'post',
context: this,
@@ -4262,9 +4259,7 @@ EDITOR.prototype = {
*/
previous_page: function(e) {
e.preventDefault();
var pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT);
this.currentpage = parseInt(pageselect.get('value'), 10) - 1;
this.currentpage--;
if (this.currentpage < 0) {
this.currentpage = 0;
}
@@ -4278,9 +4273,7 @@ EDITOR.prototype = {
*/
next_page: function(e) {
e.preventDefault();
var pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT);
this.currentpage = parseInt(pageselect.get('value'), 10) + 1;
this.currentpage++;
if (this.currentpage >= this.pages.length) {
this.currentpage = this.pages.length - 1;
}
mod/assign/feedback/editpdf/yui/src/editor/js/commentsearch.js
Vendored
+5 -5
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'),
pageselect = editor.get_dialogue_element(SELECTOR.PAGESELECT);
editor = this.get('editor');
this.hide();
editor.currentpage = parseInt(pageselect.get('value'), 10);
if (comment.pageno !== editor.currentpage) {
if (comment.pageno === editor.currentpage) {
comment.drawable.nodes[0].one('textarea').focus();
} 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
Vendored
+2 -9
View File
@@ -993,11 +993,8 @@ EDITOR.prototype = {
*/
save_current_page: function() {
var ajaxurl = AJAXBASE,
pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT),
config;
this.currentpage = parseInt(pageselect.get('value'), 10);
config = {
method: 'post',
context: this,
@@ -1171,9 +1168,7 @@ EDITOR.prototype = {
*/
previous_page: function(e) {
e.preventDefault();
var pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT);
this.currentpage = parseInt(pageselect.get('value'), 10) - 1;
this.currentpage--;
if (this.currentpage < 0) {
this.currentpage = 0;
}
@@ -1187,9 +1182,7 @@ EDITOR.prototype = {
*/
next_page: function(e) {
e.preventDefault();
var pageselect = this.get_dialogue_element(SELECTOR.PAGESELECT);
this.currentpage = parseInt(pageselect.get('value'), 10) + 1;
this.currentpage++;
if (this.currentpage >= this.pages.length) {
this.currentpage = this.pages.length - 1;
}