Optimize next and previous functions.

Author: jeff-phillips-18

src/wizard/wizard-directive.js

@@ -635,32 +635,22 @@ angular.module('patternfly.wizard').directive('pfWizard', function ($window) {
         }
 
         // Check if callback is a function
-        if (angular.isFunction(callback)) {
-          if (callback($scope.selectedStep)) {
-            if (index <= enabledSteps.length - 1) {
-              // Go to the next step
-              if (enabledSteps[index + 1].substeps) {
-                enabledSteps[index + 1].resetNav();
-              }
-            } else {
-              this.finish();
-              return;
-            }
+        if (!angular.isFunction(callback) || callback($scope.selectedStep)) {
+          // Completed property set on scope which is used to add class/remove class from progress bar
+          $scope.selectedStep.completed = true;
+
+          // Check to see if this is the last step.  If it is next behaves the same as finish()
+          if (index === enabledSteps.length - 1) {
+            this.finish();
           } else {
-            return;
+            // Go to the next step
+            if (enabledSteps[index + 1].substeps) {
+              enabledSteps[index + 1].resetNav();
+            }
+            // Go to the next step
+            $scope.goTo(enabledSteps[index + 1]);
           }
         }
-
-        // Completed property set on scope which is used to add class/remove class from progress bar
-        $scope.selectedStep.completed = true;
-
-        // Check to see if this is the last step.  If it is next behaves the same as finish()
-        if (index === enabledSteps.length - 1) {
-          this.finish();
-        } else {
-          // Go to the next step
-          $scope.goTo(enabledSteps[index + 1]);
-        }
       };
 
       this.previous = function (callback) {
@@ -673,15 +663,7 @@ angular.module('patternfly.wizard').directive('pfWizard', function ($window) {
         }
 
         // Check if callback is a function
-        if (angular.isFunction(callback)) {
-          if (callback($scope.selectedStep)) {
-            if (index === 0) {
-              throw new Error("Can't go back. It's already in step 0");
-            } else {
-              $scope.goTo($scope.getEnabledSteps()[index - 1]);
-            }
-          }
-        } else {
+        if (!angular.isFunction(callback) || callback($scope.selectedStep)) {
           if (index === 0) {
             throw new Error("Can't go back. It's already in step 0");
           } else {

src/wizard/wizard-step-directive.js

@@ -348,33 +348,25 @@ angular.module('patternfly.wizard').directive('pfWizardStep', function () {
       // Method used for next button within step
       $scope.next = function (callback) {
         var enabledSteps = $scope.getEnabledSteps();
+        var goNext = false;
 
         // Save the step  you were on when next() was invoked
         var index = stepIdx($scope.selectedStep);
 
         // Check if callback is a function
-        if (angular.isFunction (callback)) {
-          if (callback($scope.selectedStep)) {
-            if (index === enabledSteps.length - 1) {
-              return false;
-            }
+        if (!angular.isFunction (callback) || callback($scope.selectedStep)) {
+
+          // Completed property set on scope which is used to add class/remove class from progress bar
+          $scope.selectedStep.completed = true;
+
+          if (index < enabledSteps.length - 1) {
             // Go to the next step
             $scope.goTo(enabledSteps[index + 1]);
-            return true;
+            goNext = true;
           }
-          return true;
         }
 
-        // Completed property set on scope which is used to add class/remove class from progress bar
-        $scope.selectedStep.completed = true;
-
-        // Check to see if this is the last step.  If it is next behaves the same as finish()
-        if (index === enabledSteps.length - 1) {
-          return false;
-        }
-        // Go to the next step
-        $scope.goTo(enabledSteps[index + 1]);
-        return true;
+        return goNext;
       };
 
       $scope.previous = function (callback) {