allow delayed loading

botui · Jul 16, 2017 · 69f668b · 69f668b
1 parent 4c2396e
commit 69f668b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/build/botui.js b/build/botui.js
@@ -176,7 +176,7 @@
     function _addMessage(_msg) {
 
       if(!_msg.loading && !_msg.content) {
-        throw Error('BotUI: "content" is required in message object.');
+        throw Error('BotUI: "content" is required in a non-loading message object.');
       }
 
       _msg.type = _msg.type || 'text';
@@ -185,8 +185,12 @@
 
       return new Promise(function (resolve, reject) {
         setTimeout(function () {
-          if(_msg.delay && !_msg.loading) { // if its a loading message then only do in 'update'
-            _instance.messages[_index].visible = true;
+          if(_msg.delay) {
+            _msg.visible = true;
+
+            if(_msg.loading) {
+              _msg.loading = false;
+            }
           }
           resolve(_index);
         }, _msg.delay || 0);

diff --git a/build/botui.min.js b/build/botui.min.js
diff --git a/src/scripts/botui.js b/src/scripts/botui.js
@@ -167,7 +167,7 @@
     function _addMessage(_msg) {
 
       if(!_msg.loading && !_msg.content) {
-        throw Error('BotUI: "content" is required in message object.');
+        throw Error('BotUI: "content" is required in a non-loading message object.');
       }
 
       _msg.type = _msg.type || 'text';
@@ -176,8 +176,12 @@
 
       return new Promise(function (resolve, reject) {
         setTimeout(function () {
-          if(_msg.delay && !_msg.loading) { // if its a loading message then only do in 'update'
-            _instance.messages[_index].visible = true;
+          if(_msg.delay) {
+            _msg.visible = true;
+
+            if(_msg.loading) {
+              _msg.loading = false;
+            }
           }
           resolve(_index);
         }, _msg.delay || 0);

diff --git a/test.html b/test.html
@@ -25,6 +25,7 @@
         }).then(function () {
           botui.message.add({
             delay: 2000,
+            loading: true,
             content: 'Delayed Hello World'
           });
         });