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

Merge branch 'wip-mdl-56840-m31' of https://github.com/rajeshtaneja/moodle into MOODLE_31_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2016-11-10 09:45:49 +08:00
parent b81f565740 60a67bd6ee
commit 1717bd7cd4
4 changed files with 21 additions and 3 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
+6
View File
@@ -3539,7 +3539,9 @@ EDITOR.prototype = {
}
// New ajax request delayed of a second.
M.util.js_pending('checkconversionstatus');
Y.later(1000, this, function () {
M.util.js_complete('checkconversionstatus');
Y.io(AJAXBASEPROGRESS, checkconversionstatus);
});
}
@@ -3549,7 +3551,9 @@ EDITOR.prototype = {
// We only continue on error if the all pages were not generated,
// and if the ajax call did not produce 5 errors in the row.
if (this.pagecount === 0 && ajax_error_total < 5) {
M.util.js_pending('checkconversionstatus');
Y.later(1000, this, function () {
M.util.js_complete('checkconversionstatus');
Y.io(AJAXBASEPROGRESS, checkconversionstatus);
});
}
@@ -3559,8 +3563,10 @@ EDITOR.prototype = {
};
// We start the AJAX "generated page total number" call a second later to give a chance to
// the AJAX "combined pdf generation" call to clean the previous submission images.
M.util.js_pending('checkconversionstatus');
Y.later(1000, this, function () {
ajax_error_total = 0;
M.util.js_complete('checkconversionstatus');
Y.io(AJAXBASEPROGRESS, checkconversionstatus);
});
}
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
Vendored
+3 -3
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
+6
View File
@@ -3539,7 +3539,9 @@ EDITOR.prototype = {
}
// New ajax request delayed of a second.
M.util.js_pending('checkconversionstatus');
Y.later(1000, this, function () {
M.util.js_complete('checkconversionstatus');
Y.io(AJAXBASEPROGRESS, checkconversionstatus);
});
}
@@ -3549,7 +3551,9 @@ EDITOR.prototype = {
// We only continue on error if the all pages were not generated,
// and if the ajax call did not produce 5 errors in the row.
if (this.pagecount === 0 && ajax_error_total < 5) {
M.util.js_pending('checkconversionstatus');
Y.later(1000, this, function () {
M.util.js_complete('checkconversionstatus');
Y.io(AJAXBASEPROGRESS, checkconversionstatus);
});
}
@@ -3559,8 +3563,10 @@ EDITOR.prototype = {
};
// We start the AJAX "generated page total number" call a second later to give a chance to
// the AJAX "combined pdf generation" call to clean the previous submission images.
M.util.js_pending('checkconversionstatus');
Y.later(1000, this, function () {
ajax_error_total = 0;
M.util.js_complete('checkconversionstatus');
Y.io(AJAXBASEPROGRESS, checkconversionstatus);
});
}
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
Vendored
+6
View File
@@ -459,7 +459,9 @@ EDITOR.prototype = {
}
// New ajax request delayed of a second.
M.util.js_pending('checkconversionstatus');
Y.later(1000, this, function () {
M.util.js_complete('checkconversionstatus');
Y.io(AJAXBASEPROGRESS, checkconversionstatus);
});
}
@@ -469,7 +471,9 @@ EDITOR.prototype = {
// We only continue on error if the all pages were not generated,
// and if the ajax call did not produce 5 errors in the row.
if (this.pagecount === 0 && ajax_error_total < 5) {
M.util.js_pending('checkconversionstatus');
Y.later(1000, this, function () {
M.util.js_complete('checkconversionstatus');
Y.io(AJAXBASEPROGRESS, checkconversionstatus);
});
}
@@ -479,8 +483,10 @@ EDITOR.prototype = {
};
// We start the AJAX "generated page total number" call a second later to give a chance to
// the AJAX "combined pdf generation" call to clean the previous submission images.
M.util.js_pending('checkconversionstatus');
Y.later(1000, this, function () {
ajax_error_total = 0;
M.util.js_complete('checkconversionstatus');
Y.io(AJAXBASEPROGRESS, checkconversionstatus);
});
}