added path option

Author: benmarch

app/tour_directive.js

@@ -32,10 +32,15 @@
                     });
 
                     //If there is an options argument passed, just use that instead
+                    //@deprecated use 'options' instead
                     if (attrs.tourOptions) {
                         angular.extend(tour, scope.$eval(attrs.tourOptions));
                     }
 
+                    if (attrs[TourHelpers.getAttrName('options')]) {
+                        angular.extend(tour, scope.$eval(attrs[TourHelpers.getAttrName('options')]));
+                    }
+
                     //Initialize tour
                     scope.tour = ctrl.init(tour);
                     scope.tour.refresh = ctrl.refreshTour;

app/tour_helpers.js

@@ -89,12 +89,12 @@
 
             var template;
 
-            if (attrs.template) {
-                template = compileTemplate(scope.$eval(attrs.template), scope);
+            if (attrs[helpers.getAttrName('template')]) {
+                template = compileTemplate(scope.$eval(attrs[helpers.getAttrName('template')]), scope);
             }
 
-            if (attrs.templateUrl) {
-                template = lookupTemplate(attrs.templateUrl, scope);
+            if (attrs[helpers.getAttrName('templateUrl')]) {
+                template = lookupTemplate(attrs[helpers.getAttrName('templateUrl')], scope);
             }
 
             if (template) {
@@ -114,13 +114,10 @@
         helpers.attachEventHandlers = function (scope, attrs, options, events) {
 
             angular.forEach(events, function (eventName) {
-                if (TourConfig.get('prefixOptions')) {
-                    eventName = TourConfig.get('prefix') + eventName.charAt(0).toUpperCase() + eventName.substr(1);
-                }
-                if (attrs[eventName]) {
+                if (attrs[helpers.getAttrName(eventName)]) {
                     options[eventName] = function (tour) {
                         safeApply(scope, function () {
-                            scope.$eval(attrs[eventName]);
+                            scope.$eval(attrs[helpers.getAttrName(eventName)]);
                         });
                     };
                 }
@@ -138,19 +135,30 @@
         helpers.attachInterpolatedValues = function (attrs, options, keys) {
 
             angular.forEach(keys, function (key) {
-                if (TourConfig.get('prefixOptions')) {
-                    key = TourConfig.get('prefix') + key.charAt(0).toUpperCase() + key.substr(1);
-                }
-                if (attrs[key]) {
-                    options[key] = stringToBoolean(attrs[key]);
-                    attrs.$observe(key, function (newValue) {
+                if (attrs[helpers.getAttrName(key)]) {
+                    options[key] = stringToBoolean(attrs[helpers.getAttrName(key)]);
+                    attrs.$observe(helpers.getAttrName(key), function (newValue) {
                         options[key] = stringToBoolean(newValue);
                     });
                 }
             });
 
         };
 
+        /**
+         * Returns the attribute name for an option depending on the prefix
+         *
+         * @param {string} option - name of option
+         * @returns {string} potentially prefixed name of option, or just name of option
+         */
+        helpers.getAttrName = function (option) {
+            if (TourConfig.get('prefixOptions')) {
+                return TourConfig.prefix + option.charAt(0).toUpperCase() + option.substr(1);
+            } else {
+                return option;
+            }
+        };
+
         return helpers;
 
     }]);

app/tour_step_directive.js

@@ -4,7 +4,7 @@
     'use strict';
 
     function directive() {
-        return ['TourHelpers', function (TourHelpers) {
+        return ['TourHelpers', 'TourConfig', function (TourHelpers, TourConfig) {
 
             return {
                 restrict: 'EA',
@@ -21,7 +21,7 @@
 
                     //Pass interpolated values through
                     TourHelpers.attachInterpolatedValues(attrs, step, options);
-                    attrs.$observe('order', function (order) {
+                    attrs.$observe(TourHelpers.getAttrName('order'), function (order) {
                         step.order = !isNaN(order*1) ? order*1 : 0;
                         ctrl.refreshTour();
                     });
@@ -35,11 +35,11 @@
                     //Check whether or not the step should be skipped
                     function stepIsSkipped() {
                         var skipped;
-                        if (attrs.skip) {
-                            skipped = scope.$eval(attrs.skip);
+                        if (attrs[TourHelpers.getAttrName('skip')]) {
+                            skipped = scope.$eval(attrs[TourHelpers.getAttrName('skip')]);
                         }
                         if (!skipped) {
-                            skipped = element.is(':hidden');
+                            skipped = !!step.path || element.is(':hidden');
                         }
                         return skipped;
                     }
@@ -52,8 +52,16 @@
                     });
 
                     //If there is an options argument passed, just use that instead
-                    if (attrs.options) {
-                        angular.extend(step, scope.$eval(attrs.options));
+                    if (attrs[TourHelpers.getAttrName('options')]) {
+                        angular.extend(step, scope.$eval(attrs[TourHelpers.getAttrName('options')]));
+                    }
+
+                    //set up redirects
+                    if (attrs[TourHelpers.getAttrName('path')]) {
+                        step.path = document.location.pathname + '#' + scope.$eval(TourHelpers.getAttrName('path'));
+                    }
+                    if (attrs[TourHelpers.getAttrName('abspath')]) {
+                        step.path = scope.$eval(TourHelpers.getAttrName('abspath'));
                     }
 
                     //Add step to tour