integrate skip to correct step, updated version in source

sorich87 · Sep 1, 2013 · 920a4b8 · 920a4b8
1 parent aca2f52
commit 920a4b8
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 30 deletions.
diff --git a/build/js/bootstrap-tour.js b/build/js/bootstrap-tour.js
@@ -1,5 +1,5 @@
 /* ===========================================================
-# bootstrap-tour - v0.5.1
+# bootstrap-tour - v0.6.0
 # http://bootstraptour.com
 # ==============================================================
 # Copyright 2012-2013 Ulrich Sossou
@@ -226,12 +226,13 @@
       };
 
       Tour.prototype.showStep = function(i) {
-        var promise, showStepHelper, step,
+        var promise, showStepHelper, skipToPrevious, step,
           _this = this;
         step = this.getStep(i);
         if (!step) {
           return;
         }
+        skipToPrevious = i < this._current;
         promise = this._makePromise(step.onShow != null ? step.onShow(this, i) : void 0);
         showStepHelper = function(e) {
           var current_path, path;
@@ -245,7 +246,11 @@
           if (_this._isOrphan(step)) {
             if (!step.orphan) {
               _this._debug("Skip the orphan step " + (_this._current + 1) + ". Orphan option is false and the element doesn't exist or is hidden.");
-              _this._showNextStep();
+              if (skipToPrevious) {
+                _this._showPrevStep();
+              } else {
+                _this._showNextStep();
+              }
               return;
             }
             _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true.");
@@ -268,11 +273,7 @@
           return this.setState("current_step", value);
         } else {
           this._current = this.getState("current_step");
-          if (this._current === null) {
-            return this._current = 0;
-          } else {
-            return this._current = parseInt(this._current);
-          }
+          return this._current = this._current === null ? 0 : parseInt(this._current, 10);
         }
       };
 

diff --git a/build/js/bootstrap-tour.min.js b/build/js/bootstrap-tour.min.js
diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-tour",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "main": ["./build/js/bootstrap-tour.js", "./build/css/bootstrap-tour.css"],
   "dependencies": {
     "bootstrap": "3.0.0",

diff --git a/docs/assets/js/bootstrap-tour.js b/docs/assets/js/bootstrap-tour.js
@@ -1,5 +1,5 @@
 /* ===========================================================
-# bootstrap-tour - v0.5.1
+# bootstrap-tour - v0.6.0
 # http://bootstraptour.com
 # ==============================================================
 # Copyright 2012-2013 Ulrich Sossou
@@ -226,12 +226,13 @@
       };
 
       Tour.prototype.showStep = function(i) {
-        var promise, showStepHelper, step,
+        var promise, showStepHelper, skipToPrevious, step,
           _this = this;
         step = this.getStep(i);
         if (!step) {
           return;
         }
+        skipToPrevious = i < this._current;
         promise = this._makePromise(step.onShow != null ? step.onShow(this, i) : void 0);
         showStepHelper = function(e) {
           var current_path, path;
@@ -245,7 +246,11 @@
           if (_this._isOrphan(step)) {
             if (!step.orphan) {
               _this._debug("Skip the orphan step " + (_this._current + 1) + ". Orphan option is false and the element doesn't exist or is hidden.");
-              _this._showNextStep();
+              if (skipToPrevious) {
+                _this._showPrevStep();
+              } else {
+                _this._showNextStep();
+              }
               return;
             }
             _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true.");
@@ -268,11 +273,7 @@
           return this.setState("current_step", value);
         } else {
           this._current = this.getState("current_step");
-          if (this._current === null) {
-            return this._current = 0;
-          } else {
-            return this._current = parseInt(this._current);
-          }
+          return this._current = this._current === null ? 0 : parseInt(this._current, 10);
         }
       };
 

diff --git a/docs/assets/js/bootstrap-tour.min.js b/docs/assets/js/bootstrap-tour.min.js
diff --git a/docs/assets/js/index.js b/docs/assets/js/index.js
@@ -13,10 +13,12 @@
     });
     tour.addSteps([
       {
+        element: "#download",
         placement: "bottom",
         title: "Welcome to Bootstrap Tour!",
         content: "Introduce new users to your product by walking them through it step by step. Built" + "on the awesome <a href='http://twitter.github.com/bootstrap' target='_blank'>Bootstrap " + "from Twitter.</a>"
       }, {
+        element: "#usage",
         placement: "top",
         title: "Setup in four easy steps",
         content: "Easy is better, right? Easy like Bootstrap."

diff --git a/docs/index.coffee b/docs/index.coffee
@@ -8,12 +8,14 @@ $ ->
   )
 
   tour.addSteps [
+      element: "#download"
       placement: "bottom"
       title: "Welcome to Bootstrap Tour!"
       content: "Introduce new users to your product by walking them through it step by step. Built" +
         "on the awesome <a href='http://twitter.github.com/bootstrap' target='_blank'>Bootstrap " +
         "from Twitter.</a>"
     ,
+      element: "#usage"
       placement: "top"
       title: "Setup in four easy steps"
       content: "Easy is better, right? Easy like Bootstrap."

diff --git a/docs/index.html b/docs/index.html
@@ -57,7 +57,7 @@ <h1 id="reflex">Bootstrap Tour</h1>
                         <a href="#demo">Demo</a>
                     </li>
                     <li>
-                        Version 0.5.1
+                        Version 0.6.0
                     </li>
                     <li>
                         Bootstrap version <= 3.0.0

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-tour",
   "description": "Quick and easy way to build your product tours with Twitter Bootstrap Popovers.",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "keywords": [
     "tour",
     "bootstrap",

diff --git a/src/coffee/bootstrap-tour.coffee b/src/coffee/bootstrap-tour.coffee
@@ -183,7 +183,7 @@
     hideStep: (i) ->
       step = @getStep(i)
 
-      # If onHide returns a promise, lets wait until it's done to execute
+      # If onHide returns a promise, let's wait until it's done to execute
       promise = @_makePromise(step.onHide(@, i) if step.onHide?)
 
       hideStepHelper = (e) =>
@@ -203,7 +203,9 @@
       step = @getStep(i)
       return unless step
 
-      # If onShow returns a promise, lets wait until it's done to execute
+      skipToPrevious = i < @_current
+
+      # If onShow returns a promise, let's wait until it's done to execute
       promise = @_makePromise(step.onShow(@, i) if step.onShow?)
 
       showStepHelper = (e) =>
@@ -222,7 +224,7 @@
         if @_isOrphan(step)
           if ( ! step.orphan)
             @_debug "Skip the orphan step #{@_current + 1}. Orphan option is false and the element doesn't exist or is hidden."
-            @_showNextStep()
+            if skipToPrevious then @_showPrevStep() else @_showNextStep()
             return
 
           @_debug "Show the orphan step #{@_current + 1}. Orphans option is true."
@@ -243,10 +245,7 @@
         @setState("current_step", value)
       else
         @_current = @getState("current_step")
-        if @_current == null
-          @_current = 0
-        else
-          @_current = parseInt(@_current)
+        @_current = if @_current == null then 0 else parseInt(@_current, 10)
 
     # Show next step
     _showNextStep: ->