step progress bug fix

VeryWow · May 16, 2017 · ef3279a · ef3279a
1 parent 64028cb
commit ef3279a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/classes/Step.js b/classes/Step.js
@@ -5,6 +5,7 @@ export class Step {
     this.next = params.next
     this.methods = params.methods || {}
     this.template = params.template || ''
+    this.ignore_progress = params.ignore_progress || false
     this.from = null
     this._data = {}
     params.interceptors = params.interceptors || {}

diff --git a/classes/StepSystem.js b/classes/StepSystem.js
@@ -89,7 +89,7 @@ export class StepSystem {
       return this
     }
     if (next_step) {
-      this.goToStep(this.step(next_step), curr_step.name)
+      this.goToStep(this.step(next_step), { from: curr_step.name })
     } else {
       if (this.onFinish) {
         this.onFinish()
@@ -106,18 +106,20 @@ export class StepSystem {
       return this
     }
     if (prev_step) {
-      this.goToStep(this.step(prev_step))
       this.steps_past.pop()
+      this.goToStep(this.step(prev_step), { is_back: true })
     }
   }
 
-  goToStep (step, from = null) {
+  goToStep (step, params = {}) {
+    let from = params.from || null
+    let is_back = params.is_back || false
     if (from) {
       step.from = from
     }
     this._current_step = step.name
     this.render(step)
-    if (this.steps_past.indexOf(step.name) < 0) {
+    if (this.steps_past.indexOf(step.name) < 0 && !is_back) {
       this.steps_past.push(step.name)
     }
     this.updateProgress()

diff --git a/example/dist/app.js b/example/dist/app.js