Skip to content
Snippets Groups Projects
Commit 5323637e authored by srosse's avatar srosse
Browse files

Merge remote-tracking branch 'origin/OpenOLAT_15.2'

parents b30dac78 fcb4b5ba
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
var periodic = jQuery.periodic({period: 1000, decay:1.0, max_period: availableTime + 1000 }, function() { var periodic = jQuery.periodic({period: 1000, decay:1.0, max_period: availableTime + 1000 }, function() {
var remaining = availableTime - (Date.now() - startTime); var remaining = availableTime - (Date.now() - startTime);
if(jQuery("#" + settings.formName).length == 0) { if(jQuery("#" + settings.formName).length == 0) {
console.log('Cancelled');
periodic.cancel(); periodic.cancel();
if(window.qti21CountDown == periodic) { if(window.qti21CountDown == periodic) {
window.qti21CountDown = null; window.qti21CountDown = null;
......
...@@ -114,8 +114,6 @@ public class QTI21ConfigurationCEPage { ...@@ -114,8 +114,6 @@ public class QTI21ConfigurationCEPage {
browser.findElement(confirmBy).click(); browser.findElement(confirmBy).click();
OOGraphene.waitBusy(browser); OOGraphene.waitBusy(browser);
OOGraphene.moveTo(By.className("o_qti_21_datetest_end"), browser);
// set dates // set dates
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setTime(start); cal.setTime(start);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment