Fixed issue #13601: {TIME} placeholder not working (#2042)

Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>
LimeSurvey · Sep 22, 2021 · d937934 · d937934
1 parent e303e1a
commit d937934
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/assets/packages/questions/timer/src/timeclass.js b/assets/packages/questions/timer/src/timeclass.js
@@ -119,6 +119,8 @@ export default class TimerConstructor {
     _showWarning() {
         if (this.option.warning !== 0) {
             this.timerLogger.log('Warning called!');
+            const timeObject = this._parseTimeToObject(this.option.warning, true);
+            this.$warningTimeDisplayElement.html(timeObject.hours + ':' + timeObject.minutes + ':' + timeObject.seconds);
             this.$warningDisplayElement.removeClass('hidden').css({
                 opacity: 0
             }).animate({
@@ -141,6 +143,8 @@ export default class TimerConstructor {
     _showWarning2() {
         if (this.option.warning2 !== 0) {
             this.timerLogger.log('Warning2 called!');
+            const timeObject = this._parseTimeToObject(this.option.warning, true);
+            this.$warning2TimeDisplayElement.html(timeObject.hours + ':' + timeObject.minutes + ':' + timeObject.seconds);
             this.$warning2DisplayElement.removeClass('hidden').css({
                 opacity: 0
             }).animate({

diff --git a/assets/packages/questions/timer/timer.js b/assets/packages/questions/timer/timer.js
diff --git a/assets/packages/questions/timer/timer.min.js b/assets/packages/questions/timer/timer.min.js
diff --git a/assets/packages/questions/timer/yarn.lock b/assets/packages/questions/timer/yarn.lock
@@ -3138,6 +3138,20 @@ uglifyjs-webpack-plugin@^1.2.4:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+uglifyjs-webpack-plugin@^1.2.7:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
+  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
+  dependencies:
+    cacache "^10.0.4"
+    find-cache-dir "^1.0.0"
+    schema-utils "^0.4.5"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    uglify-es "^3.3.4"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
 uglifyjs@^2.4.11:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/uglifyjs/-/uglifyjs-2.4.11.tgz#3440d64e045759589524418eb641c68bb90d113e"