refactor callbacks

lib/scripts/Component.js

@@ -20,6 +20,7 @@ var Component = React.createClass({
   displayName: 'Joyride',
 
   propTypes: {
+    callback: React.PropTypes.func,
     completeCallback: React.PropTypes.func,
     debug: React.PropTypes.bool,
     keyboardNavigation: React.PropTypes.bool,
@@ -61,9 +62,7 @@ var Component = React.createClass({
       showStepsProgress: false,
       steps: [],
       tooltipOffset: 15,
-      type: 'single',
-      completeCallback: undefined,
-      stepCallback: undefined
+      type: 'single'
     };
   },
 
@@ -432,7 +431,16 @@ var Component = React.createClass({
    */
   _onBeaconTrigger: function(e) {
     e.preventDefault();
-    this._toggleTooltip(true, this.state.index);
+    var props = this.props;
+    var state = this.state;
+
+    if (typeof props.callback === 'function') {
+      props.callback({
+        type: 'step:before',
+        step: props.steps[state.index]
+      });
+    }
+    this._toggleTooltip(true, state.index);
   },
 
   /**
@@ -495,14 +503,31 @@ var Component = React.createClass({
     }, function() {
       var lastIndex = action === 'back' ? index + 1 : index - 1;
 
-      if (action && typeof props.stepCallback === 'function' && props.steps[lastIndex]) {
-        props.stepCallback(props.steps[lastIndex]);
+      if (action && props.steps[lastIndex]) {
+        if (typeof props.stepCallback === 'function') { // Deprecated
+          props.stepCallback(props.steps[lastIndex]);
+        }
+
+        if (typeof props.callback === 'function') {
+          props.callback({
+            type: 'step:after',
+            step: props.steps[lastIndex]
+          });
+        }
       }
 
       if (props.steps.length && !props.steps[index]) {
-        if (typeof props.completeCallback === 'function') {
+        if (typeof props.completeCallback === 'function') { // Deprecated
           props.completeCallback(props.steps, this.state.skipped);
         }
+
+        if (typeof props.callback === 'function') {
+          props.callback({
+            type: 'finished',
+            steps: props.steps,
+            skipped: this.state.skipped
+          });
+        }
       }
     });
   },