Revert "set delay popover options instead of use a custom delay imple…

…mentation" This reverts commit 06400fd.
sorich87 · Jul 17, 2015 · 1d78307 · 1d78307
1 parent 06400fd
commit 1d78307
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 23 deletions.
diff --git a/build/js/bootstrap-tour-standalone.js b/build/js/bootstrap-tour-standalone.js
@@ -676,7 +676,7 @@
         redirect: true,
         orphan: false,
         duration: false,
-        delay: 0,
+        delay: false,
         basePath: '',
         template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
         afterSetState: function(key, value) {},
@@ -981,7 +981,16 @@
           }
         };
       })(this);
-      this._callOnPromiseDone(promise, showStepHelper);
+      if (step.delay) {
+        this._debug("Wait " + step.delay + " milliseconds to show the step " + (this._current + 1));
+        window.setTimeout((function(_this) {
+          return function() {
+            return _this._callOnPromiseDone(promise, showStepHelper);
+          };
+        })(this), step.delay);
+      } else {
+        this._callOnPromiseDone(promise, showStepHelper);
+      }
       return promise;
     };
 
@@ -1175,8 +1184,7 @@
         animation: step.animation,
         container: step.container,
         template: step.template,
-        selector: step.element,
-        delay: step.delay
+        selector: step.element
       }).popover('show');
       $tip = $element.data('bs.popover') ? $element.data('bs.popover').tip() : $element.data('popover').tip();
       $tip.attr('id', step.id);

diff --git a/build/js/bootstrap-tour-standalone.min.js b/build/js/bootstrap-tour-standalone.min.js
diff --git a/build/js/bootstrap-tour.js b/build/js/bootstrap-tour.js
@@ -44,7 +44,7 @@
         redirect: true,
         orphan: false,
         duration: false,
-        delay: 0,
+        delay: false,
         basePath: '',
         template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
         afterSetState: function(key, value) {},
@@ -349,7 +349,16 @@
           }
         };
       })(this);
-      this._callOnPromiseDone(promise, showStepHelper);
+      if (step.delay) {
+        this._debug("Wait " + step.delay + " milliseconds to show the step " + (this._current + 1));
+        window.setTimeout((function(_this) {
+          return function() {
+            return _this._callOnPromiseDone(promise, showStepHelper);
+          };
+        })(this), step.delay);
+      } else {
+        this._callOnPromiseDone(promise, showStepHelper);
+      }
       return promise;
     };
 
@@ -543,8 +552,7 @@
         animation: step.animation,
         container: step.container,
         template: step.template,
-        selector: step.element,
-        delay: step.delay
+        selector: step.element
       }).popover('show');
       $tip = $element.data('bs.popover') ? $element.data('bs.popover').tip() : $element.data('popover').tip();
       $tip.attr('id', step.id);

diff --git a/build/js/bootstrap-tour.min.js b/build/js/bootstrap-tour.min.js
diff --git a/src/coffee/bootstrap-tour.coffee b/src/coffee/bootstrap-tour.coffee
@@ -22,7 +22,7 @@
         redirect: true
         orphan: false
         duration: false
-        delay: 0
+        delay: false
         basePath: ''
         template: '<div class="popover" role="tooltip">
           <div class="arrow"></div>
@@ -299,7 +299,13 @@
         # Play step timer
         @resume() if step.duration
 
-      @_callOnPromiseDone promise, showStepHelper
+      if step.delay
+        @_debug "Wait #{step.delay} milliseconds to show the step #{@_current + 1}"
+        window.setTimeout =>
+          @_callOnPromiseDone promise, showStepHelper
+        , step.delay
+      else
+        @_callOnPromiseDone promise, showStepHelper
 
       promise
 
@@ -475,7 +481,6 @@
         container: step.container
         template: step.template
         selector: step.element
-        delay: step.delay
       )
       .popover 'show'
 

diff --git a/src/docs/api.html b/src/docs/api.html
@@ -24,7 +24,7 @@ <h3 id="tour-options">Global options</h3>
   redirect: true,
   orphan: false,
   duration: false,
-  delay: 0,
+  delay: false,
   basePath: "",
   template: "<div class='popover tour'>
     <div class='arrow'></div>
@@ -166,10 +166,11 @@ <h3 class='popover-title'></h3>
         </tr>
         <tr id="delay" class="success">
           <td>delay <span class="label label-success">NEW</span></td>
-          <td>Number</td>
+          <td>Boolean|Number</td>
           <td>Specifies a delay for the showing and hiding the tour steps.
           It can be:
           <ul>
+            <li>a falsy - there is no delay</li>
             <li>a number - used as a delay for both showing and hiding. In milliseconds</li>
             <li>a object containing optional <code>show</code> and <code>hide</code> numbers - defines the delays for showing and hiding respectively</li>
           </ul>

diff --git a/src/docs/assets/js/bootstrap-tour.js b/src/docs/assets/js/bootstrap-tour.js
@@ -44,7 +44,7 @@
         redirect: true,
         orphan: false,
         duration: false,
-        delay: 0,
+        delay: false,
         basePath: '',
         template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
         afterSetState: function(key, value) {},
@@ -349,7 +349,16 @@
           }
         };
       })(this);
-      this._callOnPromiseDone(promise, showStepHelper);
+      if (step.delay) {
+        this._debug("Wait " + step.delay + " milliseconds to show the step " + (this._current + 1));
+        window.setTimeout((function(_this) {
+          return function() {
+            return _this._callOnPromiseDone(promise, showStepHelper);
+          };
+        })(this), step.delay);
+      } else {
+        this._callOnPromiseDone(promise, showStepHelper);
+      }
       return promise;
     };
 
@@ -543,8 +552,7 @@
         animation: step.animation,
         container: step.container,
         template: step.template,
-        selector: step.element,
-        delay: step.delay
+        selector: step.element
       }).popover('show');
       $tip = $element.data('bs.popover') ? $element.data('bs.popover').tip() : $element.data('popover').tip();
       $tip.attr('id', step.id);

diff --git a/test/bootstrap-tour.js b/test/bootstrap-tour.js
@@ -44,7 +44,7 @@
         redirect: true,
         orphan: false,
         duration: false,
-        delay: 0,
+        delay: false,
         basePath: '',
         template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
         afterSetState: function(key, value) {},
@@ -349,7 +349,16 @@
           }
         };
       })(this);
-      this._callOnPromiseDone(promise, showStepHelper);
+      if (step.delay) {
+        this._debug("Wait " + step.delay + " milliseconds to show the step " + (this._current + 1));
+        window.setTimeout((function(_this) {
+          return function() {
+            return _this._callOnPromiseDone(promise, showStepHelper);
+          };
+        })(this), step.delay);
+      } else {
+        this._callOnPromiseDone(promise, showStepHelper);
+      }
       return promise;
     };
 
@@ -543,8 +552,7 @@
         animation: step.animation,
         container: step.container,
         template: step.template,
-        selector: step.element,
-        delay: step.delay
+        selector: step.element
       }).popover('show');
       $tip = $element.data('bs.popover') ? $element.data('bs.popover').tip() : $element.data('popover').tip();
       $tip.attr('id', step.id);