Fixed issue: in some situations lslog isn't working

LimeSurvey · Dec 22, 2017 · 39dbeee · 39dbeee
1 parent da00c75
commit 39dbeee
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 21 deletions.
diff --git a/assets/packages/lslog/build/lslog.js b/assets/packages/lslog/build/lslog.js
@@ -206,16 +206,6 @@ var ConsoleShim = function () {
             this.log('--- ERROR ---');
             this.log(args);
         }
-    }, {
-        key: 'err',
-        value: function err() {
-            this.error.apply(this, arguments);
-        }
-    }, {
-        key: 'debug',
-        value: function debug() {
-            this.trace.apply(this, arguments);
-        }
     }, {
         key: 'warn',
         value: function warn() {

diff --git a/assets/packages/lslog/build/lslog.min.js b/assets/packages/lslog/build/lslog.min.js
diff --git a/assets/packages/lslog/src/lslog.js b/assets/packages/lslog/src/lslog.js
@@ -141,12 +141,6 @@ class ConsoleShim {
         this.log(args);
     }
 
-    err() {
-        this.error.apply(this,arguments);
-    }
-    debug() {
-        this.trace.apply(this,arguments);
-    }
 
     warn() {
         const args = this._insertParamToArguments(arguments);

diff --git a/assets/packages/lstutorial/build/lstutorial.js b/assets/packages/lstutorial/build/lstutorial.js
@@ -149,7 +149,18 @@ const TourLibrary = function () {
     let _actionActiveTour = null;
 
     if (_activeTour !== false && (typeof _actionActiveTour !== 'function')) {
-        initTour(_activeTour);
+        initTour(_activeTour).then(
+            (startedTutorial) => {
+                if(startedTutorial.ended())
+                    startedTutorial.restart();
+                else
+                    startedTutorial.start(true);
+            },
+            (err) => {
+                console.ls.log('Couldn\'t be loaded!');
+                console.ls.error(err);
+            }
+        );
     }
 
     return {

diff --git a/assets/packages/lstutorial/build/lstutorial.js.map b/assets/packages/lstutorial/build/lstutorial.js.map
diff --git a/assets/packages/lstutorial/build/lstutorial.min.js b/assets/packages/lstutorial/build/lstutorial.min.js
diff --git a/assets/packages/lstutorial/src/main.js b/assets/packages/lstutorial/src/main.js
@@ -72,7 +72,18 @@ const TourLibrary = function () {
     let _actionActiveTour = null;
 
     if (_activeTour !== false && (typeof _actionActiveTour !== 'function')) {
-        initTour(_activeTour);
+        initTour(_activeTour).then(
+            (startedTutorial) => {
+                if(startedTutorial.ended())
+                    startedTutorial.restart();
+                else
+                    startedTutorial.start(true);
+            },
+            (err) => {
+                console.ls.log('Couldn\'t be loaded!');
+                console.ls.error(err);
+            }
+        );
     }
 
     return {