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

Merge branch 'MDL-52290_editpdf_pagecount' of git://github.com/davosmith/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2016-01-12 09:31:06 +00:00
committed by Dan Poltawski
parent 6009fa550c 0d5a260ecd
commit 7b9b861b7b
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
+2
View File
@@ -54,7 +54,9 @@ Feature: In an assignment, teacher can annotate PDF files during grading
And I click on "Grade" "link" in the "Submitted for grading" "table_row"
And I follow "Launch PDF editor..."
And I change window size to "large"
And I should see "Page 1 of 3"
And I click on ".navigate-next-button" "css_element"
And I should see "Page 2 of 3"
And I click on ".stampbutton" "css_element"
And I click on ".linebutton" "css_element"
And I click on ".commentcolourbutton" "css_element"
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
Vendored
+3 -1
View File
@@ -4090,6 +4090,7 @@ EDITOR.prototype = {
setup_navigation : function() {
var pageselect,
i,
strinfo,
option,
previousbutton,
nextbutton;
@@ -4101,7 +4102,8 @@ EDITOR.prototype = {
for (i = 0; i < this.pages.length; i++) {
option = Y.Node.create('<option/>');
option.setAttribute('value', i);
option.setHTML(M.util.get_string('pagenumber', 'assignfeedback_editpdf', i+1));
strinfo = {page: i+1, total: this.pages.length};
option.setHTML(M.util.get_string('pagexofy', 'assignfeedback_editpdf', strinfo));
pageselect.append(option);
}
}
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Vendored
+2 -2
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
+3 -1
View File
@@ -4090,6 +4090,7 @@ EDITOR.prototype = {
setup_navigation : function() {
var pageselect,
i,
strinfo,
option,
previousbutton,
nextbutton;
@@ -4101,7 +4102,8 @@ EDITOR.prototype = {
for (i = 0; i < this.pages.length; i++) {
option = Y.Node.create('<option/>');
option.setAttribute('value', i);
option.setHTML(M.util.get_string('pagenumber', 'assignfeedback_editpdf', i+1));
strinfo = {page: i+1, total: this.pages.length};
option.setHTML(M.util.get_string('pagexofy', 'assignfeedback_editpdf', strinfo));
pageselect.append(option);
}
}
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
Vendored
+3 -1
View File
@@ -1035,6 +1035,7 @@ EDITOR.prototype = {
setup_navigation : function() {
var pageselect,
i,
strinfo,
option,
previousbutton,
nextbutton;
@@ -1046,7 +1047,8 @@ EDITOR.prototype = {
for (i = 0; i < this.pages.length; i++) {
option = Y.Node.create('<option/>');
option.setAttribute('value', i);
option.setHTML(M.util.get_string('pagenumber', 'assignfeedback_editpdf', i+1));
strinfo = {page: i+1, total: this.pages.length};
option.setHTML(M.util.get_string('pagexofy', 'assignfeedback_editpdf', strinfo));
pageselect.append(option);
}
}