added promises for templates

Author: benmarch

app/tour_directive.js

@@ -14,6 +14,7 @@
 
                     //Pass static options through or use defaults
                     var tour = {},
+                        templateReady,
                         events = 'onStart onEnd afterGetState afterSetState afterRemoveState onShow onShown onHide onHidden onNext onPrev onPause onResume'.split(' '),
                         options = 'name container keyboard storage debug redirect duration basePath backdrop orphan'.split(' ');
 
@@ -24,7 +25,7 @@
                     TourHelpers.attachEventHandlers(scope, attrs, tour, events);
 
                     //Compile template
-                    TourHelpers.attachTemplate(scope, attrs, tour);
+                    templateReady = TourHelpers.attachTemplate(scope, attrs, tour);
 
                     //Monitor number of steps
                     scope.$watchCollection(ctrl.getSteps, function (steps) {
@@ -42,8 +43,10 @@
                     }
 
                     //Initialize tour
-                    scope.tour = ctrl.init(tour);
-                    scope.tour.refresh = ctrl.refreshTour;
+                    templateReady.then(function () {
+                        scope.tour = ctrl.init(tour);
+                        scope.tour.refresh = ctrl.refreshTour;
+                    });
 
                 }
             };

app/tour_helpers.js

@@ -3,7 +3,7 @@
 (function (app) {
     'use strict';
 
-    app.factory('TourHelpers', ['$templateCache', '$http', '$compile', 'TourConfig', function ($templateCache, $http, $compile, TourConfig) {
+    app.factory('TourHelpers', ['$templateCache', '$http', '$compile', 'TourConfig', '$q', function ($templateCache, $http, $compile, TourConfig, $q) {
 
         var helpers = {},
             safeApply;
@@ -89,24 +89,26 @@
          */
         helpers.attachTemplate = function (scope, attrs, options) {
 
-            var template;
+            var deferred = $q.defer(),
+                template;
 
             if (attrs[helpers.getAttrName('template')]) {
                 template = compileTemplate(scope.$eval(attrs[helpers.getAttrName('template')]), scope);
-            }
-
-            if (template) {
                 options.template = template;
-            }
-
-            if (attrs[helpers.getAttrName('templateUrl')]) {
+                deferred.resolve(template);
+            } else if (attrs[helpers.getAttrName('templateUrl')]) {
                 lookupTemplate(attrs[helpers.getAttrName('templateUrl')], scope).then(function (template) {
                     if (template) {
                         options.template = template;
+                        deferred.resolve(template);
                     }
                 });
+            } else {
+                deferred.resolve();
             }
 
+            return deferred.promise;
+
         };
 
         /**

app/tour_step_directive.js

@@ -20,7 +20,8 @@
                         events = 'onShow onShown onHide onHidden onNext onPrev onPause onResume'.split(' '),
                         options = 'content title path animation container placement backdrop redirect orphan reflex nextStep prevStep nextPath prevPath'.split(' '),
                         orderWatch,
-                        skipWatch;
+                        skipWatch,
+                        templateReady;
 
                     //Pass interpolated values through
                     TourHelpers.attachInterpolatedValues(attrs, step, options);
@@ -33,7 +34,7 @@
                     TourHelpers.attachEventHandlers(scope, attrs, step, events);
 
                     //Compile templates
-                    TourHelpers.attachTemplate(scope, attrs, step);
+                    templateReady = TourHelpers.attachTemplate(scope, attrs, step);
 
                     //Check whether or not the step should be skipped
                     function stepIsSkipped() {
@@ -89,7 +90,9 @@
                     }
 
                     //Add step to tour
-                    ctrl.addStep(step);
+                    templateReady.then(function () {
+                        ctrl.addStep(step);
+                    });
 
                 }
             };