Fixed a case when watcher is provided in annotated array form rathe…

…r than as a function
artch · Sep 19, 2014 · 84602f8 · 84602f8
1 parent 2706f22
commit 84602f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/example/app.js b/example/app.js
@@ -30,7 +30,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
         .within()
 
             .segment('home', {
-                default: true,
+                'default': true,
                 templateUrl: 'templates/section1/home.html'})
 
             .segment('itemInfo', {
@@ -41,7 +41,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
             .within() 
 
                 .segment('tab1', {
-                    default: true,
+                    'default': true,
                     templateUrl: 'templates/section1/tabs/tab1.html'})
 
                 .segment('tab2', {
@@ -143,7 +143,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
                 .segment('inlineChildren', {
                     // no template here
                     controller: 'SlowDataCtrl',
-                    default: true,
+                    'default': true,
                     resolve: {
                         data: function($timeout) {
                             return $timeout(function() { return 'SLOW DATA CONTENT'; }, 2000);

diff --git a/src/route-segment.js b/src/route-segment.js
@@ -404,7 +404,7 @@ mod.provider( '$routeSegment',
                         if(params.watcher) {
 
                             var getWatcherValue = function() {
-                                if(!angular.isFunction(params.watcher))
+                                if(!angular.isFunction(params.watcher) && !angular.isArray(params.watcher))
                                     throw new Error('Watcher is not a function in segment `'+name+'`');
 
                                 return $injector.invoke(