Change concat step to order files correctly (see angular-ui#49)

Author: ksperling

grunt.js

@@ -17,7 +17,18 @@ module.exports = function (grunt) {
     },
     concat: {
       build: {
-        src: ['<banner:meta.banner>', '<banner:meta.prefix>', 'src/*.js', '<banner:meta.suffix>' ],
+        src: [
+          '<banner:meta.banner>',
+          '<banner:meta.prefix>',
+          'src/common.js',
+          'src/templateFactory.js',
+          'src/urlMatcherFactory.js',
+          'src/urlRouter.js',
+          'src/state.js',
+          'src/viewDirective.js',
+          'src/compat.js',
+          '<banner:meta.suffix>'
+        ],
         dest: '<%= builddir %>/<%= pkg.name %>.js'
       }
     },
@@ -28,15 +39,15 @@ module.exports = function (grunt) {
       }
     },
     lint: {
-      files: ['grunt.js', 'src/*.js']
+      files: ['grunt.js', 'src/*.js', '<%= builddir %>/<%= pkg.name %>.js']
     },
     jshint: {
       options: {
         eqnull: true
       }
     },
     watch: {
-      files: ['src/*.js', 'test/*.js'],
+      files: ['src/*.js', 'test/**/*.js'],
       tasks: 'build test'
     }
   });

src/compat.js

@@ -5,15 +5,18 @@ function $RouteProvider(  $stateProvider,    $urlRouterProvider) {
 
   onEnterRoute.$inject = ['$$state'];
   function onEnterRoute(   $$state) {
+    /*jshint validthis: true */
     this.locals = $$state.locals.globals;
   }
 
   function onExitRoute() {
+    /*jshint validthis: true */
     this.locals = null;
   }
 
   this.when = when;
   function when(url, route) {
+    /*jshint validthis: true */
     if (route.redirectTo != null) {
       // Redirect, configure directly on $urlRouterProvider
       var redirect = route.redirectTo, handler;
@@ -59,8 +62,6 @@ function $RouteParamsProvider() {
   }
 }
 
-var $ViewDirective; // forward reference
 angular.module('ui.compat')
-    .directive('ngView', $ViewDirective)
-    .provider('$route', $RouteProvider)
-    .provider('$routeParams', $RouteParamsProvider);
+  .provider('$route', $RouteProvider)
+  .directive('ngView', $ViewDirective);

src/state.js

@@ -130,6 +130,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
   // .state(name, state)
   this.state = state;
   function state(name, definition) {
+    /*jshint validthis: true */
     if (isObject(name)) definition = name;
     else definition.name = name;
     registerState(definition);
@@ -141,6 +142,9 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
   $get.$inject = ['$rootScope', '$q', '$templateFactory', '$injector', '$stateParams', '$location', '$urlRouter'];
   function $get(   $rootScope,   $q,   $templateFactory,   $injector,   $stateParams,   $location,   $urlRouter) {
 
+    var TransitionSuperseded = $q.reject(new Error('transition superseded'));
+    var TransitionPrevented = $q.reject(new Error('transition prevented'));
+
     $state = {
       params: {},
       current: root.self,
@@ -157,14 +161,13 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
       }
     };
 
-    var TransitionSuperseded = $q.reject(new Error('transition superseded'));
-    var TransitionPrevented = $q.reject(new Error('transition prevented'));
-
     function transitionTo(to, toParams, updateLocation) {
       if (!isDefined(updateLocation)) updateLocation = true;
 
-      to = findState(to); if (to.abstract) throw new Error("Cannot transition to abstract state '" + to + "'");
-      var toPath = to.path, from = $state.$current, fromParams = $state.params, fromPath = from.path;
+      to = findState(to);
+      if (to.abstract) throw new Error("Cannot transition to abstract state '" + to + "'");
+      var toPath = to.path,
+          from = $state.$current, fromParams = $state.params, fromPath = from.path;
 
       // Starting from the root of the path, keep all levels that haven't changed
       var keep, state, locals = root.locals, toLocals = [];
@@ -183,7 +186,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
         return $q.when($state.current);
       }
 
-      // Normalize parameters before we pass them to event handlers etc.
+      // Normalize/filter parameters before we pass them to event handlers etc.
       var normalizedToParams = {};
       forEach(to.params, function (name) {
         var value = toParams[name];
@@ -227,7 +230,6 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
         }
 
         // Enter 'to' states not kept
-        // TODO: Should we be invoking onEnter in a separate pass after we've updated $state and $location?
         for (l=keep; l<toPath.length; l++) {
           entering = toPath[l];
           entering.locals = toLocals[l];
@@ -239,7 +241,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
         // Update globals in $state
         $state.$current = to;
         $state.current = to.self;
-        $state.params = toParams
+        $state.params = toParams;
         copy($state.params, $stateParams);
         $state.transition = null;
 
@@ -287,7 +289,9 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
       function resolve(deps, dst) {
         forEach(deps, function (value, key) {
           promises.push($q
-            .when(isString(value) ? $injector.get(value) : $injector.invoke(value, state.self, locals))
+            .when(isString(value) ?
+                $injector.get(value) :
+                $injector.invoke(value, state.self, locals))
             .then(function (result) {
               dst[key] = result;
             }));

test/test-config.js

@@ -10,8 +10,18 @@ files = [
   'lib/angular-1.0.4.js',
   'test/lib/angular-mocks-1.0.4.js',
   'test/testUtils.js',
-  'src/*.js',
+
+  'src/common.js',
+  'src/templateFactory.js',
+  'src/urlMatcherFactory.js',
+  'src/urlRouter.js',
+  'src/state.js',
+  'src/viewDirective.js',
+  'src/compat.js',
+  
   'test/*Spec.js',
+  // 'test/compat/matchers.js',
+  // 'test/compat/*Spec.js',
 ];
 
 // list of files to exclude