Merge pull request #314 from angular-ui/issue-254

Rename all modules to include ui.state in the name.

Author: nateabele

README.md

@@ -64,10 +64,10 @@ To evolve the concept of an [angularjs](http://angularjs.org/) [***route***](htt
       <script src="angular-ui-router.min.js"></script> <!-- Insert after main angular.js file -->
 ```
 
-2. Set `ui.state` as a dependency in your module
+2. Set `ui.router` as a dependency in your module
 >
 ```javascript
-var myapp = angular.module('myapp', ['ui.state']) 
+var myapp = angular.module('myapp', ['ui.router'])
 ```
 
 ### Nested States & Views

sample/index.html

@@ -45,7 +45,7 @@
   }
 }
 
-angular.module('sample', ['ui.compat'])
+angular.module('sample', ['ui.router.compat'])
   .config(
     [        '$stateProvider', '$routeProvider', '$urlRouterProvider',
     function ($stateProvider,   $routeProvider,   $urlRouterProvider) {

src/common.js

@@ -78,7 +78,9 @@ function inheritParams(currentParams, newParams, $current, $to) {
   return extend({}, inherited, newParams);
 }
 
-angular.module('ui.util', ['ng']);
-angular.module('ui.router', ['ui.util']);
-angular.module('ui.state', ['ui.router', 'ui.util']);
-angular.module('ui.compat', ['ui.state']);
+angular.module('ui.router.util', ['ng']);
+angular.module('ui.router.router', ['ui.router.util']);
+angular.module('ui.router.state', ['ui.router.router', 'ui.router.util']);
+angular.module('ui.router', ['ui.router.state']);
+angular.module('ui.router.compat', ['ui.router']);
+

src/compat.js

@@ -79,6 +79,6 @@ function $RouteProvider(  $stateProvider,    $urlRouterProvider) {
   }
 }
 
-angular.module('ui.compat')
+angular.module('ui.router.compat')
   .provider('$route', $RouteProvider)
   .directive('ngView', $ViewDirective);

src/state.js

@@ -321,8 +321,10 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory,           $
     };
 
     $state.href = function href(stateOrName, params, options) {
-      options = extend({ lossy: true }, options || {});
-      var state = findState(stateOrName);
+      options = extend({ lossy: true, inherit: false, relative: $state.$current }, options || {});
+      var state = findState(stateOrName, options.relative);
+
+      params = inheritParams($stateParams, params || {}, $state.$current, state);
       var nav = (state && options.lossy) ? state.navigable : state;
       var url = (nav && nav.url) ? nav.url.format(normalize(state.params, params || {})) : null;
       return !$locationProvider.html5Mode() && url ? "#" + url : url;
@@ -436,6 +438,6 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory,           $
   }
 }
 
-angular.module('ui.state')
+angular.module('ui.router.state')
   .value('$stateParams', {})
   .provider('$state', $StateProvider);

src/stateDirectives.js

@@ -39,7 +39,7 @@ function $StateRefDirective($state) {
 
       element.bind("click", function(e) {
         if ((e.which == 1) && !e.ctrlKey && !e.metaKey && !e.shiftKey) {
-          $state.transitionTo(ref.state, params);
+          $state.go(ref.state, params);
           scope.$apply();
           e.preventDefault();
         }
@@ -48,4 +48,4 @@ function $StateRefDirective($state) {
   };
 }
 
-angular.module('ui.state').directive('uiSref', $StateRefDirective);
+angular.module('ui.router.state').directive('uiSref', $StateRefDirective);

src/templateFactory.js

@@ -84,4 +84,4 @@ function $TemplateFactory(  $http,   $templateCache,   $injector) {
   };
 }
 
-angular.module('ui.util').service('$templateFactory', $TemplateFactory);
+angular.module('ui.router.util').service('$templateFactory', $TemplateFactory);

src/urlMatcherFactory.js

@@ -253,4 +253,4 @@ function $UrlMatcherFactory() {
 }
 
 // Register as a provider so it's available to other providers
-angular.module('ui.util').provider('$urlMatcherFactory', $UrlMatcherFactory);
+angular.module('ui.router.util').provider('$urlMatcherFactory', $UrlMatcherFactory);

src/urlRouter.js

@@ -114,4 +114,4 @@ function $UrlRouterProvider(  $urlMatcherFactory) {
     }];
 }
 
-angular.module('ui.router').provider('$urlRouter', $UrlRouterProvider);
+angular.module('ui.router.router').provider('$urlRouter', $UrlRouterProvider);

src/view.js

@@ -25,4 +25,4 @@ function $ViewProvider() {
   }
 }
 
-angular.module('ui.state').provider('$view', $ViewProvider);
+angular.module('ui.router.state').provider('$view', $ViewProvider);