Merge pull request #644 from oat-sa/release-5.38.4

Release 5.38.4
oat-sa · Nov 21, 2016 · be35bc7 · be35bc7
2 parents 9b4bad8 + ead0ab2
commit be35bc7
Show file tree

Hide file tree

Showing 8 changed files with 779 additions and 770 deletions.
diff --git a/manifest.php b/manifest.php
@@ -33,7 +33,7 @@
     'label' => 'QTI test model',
     'description' => 'TAO QTI test implementation',
     'license' => 'GPL-2.0',
-    'version' => '5.38.2',
+    'version' => '5.38.4',
     'author' => 'Open Assessment Technologies',
     'requires' => array(
         'taoTests' => '>=3.7.0',

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -843,5 +843,6 @@ public function update($initialVersion) {
             $this->setVersion('5.38.2');
         }
 
+        $this->skip('5.38.2', '5.38.4');
     }
 }
diff --git a/views/js/controller/runtime/testRunner.js b/views/js/controller/runtime/testRunner.js
@@ -573,7 +573,7 @@ function (
             skip: function () {
                 var self = this,
                     doSkip = function() {
-                        this.disableGui();
+                        self.disableGui();
                         self.actionCall('skip');
                     };
 

diff --git a/views/js/controllers.min.js b/views/js/controllers.min.js
diff --git a/views/js/controllers.min.js.map b/views/js/controllers.min.js.map
diff --git a/views/js/loader/qtiTestRunner.min.js b/views/js/loader/qtiTestRunner.min.js
diff --git a/views/js/loader/qtiTestRunner.min.js.map b/views/js/loader/qtiTestRunner.min.js.map
diff --git a/views/js/runner/plugins/controls/timer/timer.js b/views/js/runner/plugins/controls/timer/timer.js
@@ -249,6 +249,11 @@ define([
              */
             var updateTimers = function updateTimers(checkStorage) {
                 var timerUpdatePromises = [];
+                var context = testRunner.getTestContext();
+                if (context.extraTime) {
+                    extraTime = context.extraTime.total;
+                    consumedExtraTime = Math.max(consumedExtraTime, context.extraTime.consumed);
+                }
 
                 _.forEach(timerTypes, function(type) {
                     timerUpdatePromises.push(
-Original file line number
+Diff line change
@@ Expand Up / @@ -843,5 +843,6 @@ public function update($initialVersion) { @@
                 $this->setVersion('5.38.2');
             }
+            $this->skip('5.38.2', '5.38.4');
         }
     }