Merge branch 'master' into rename-repo-url

angular-ui-router/angular-ui-router-tests.ts

@@ -208,7 +208,7 @@ class UrlLocatorTestService implements IUrlLocatorTestService {
 
 myApp.service("urlLocatorTest", UrlLocatorTestService);
 
-module UiViewScrollProviderTests {
+namespace UiViewScrollProviderTests {
     var app = angular.module("uiViewScrollProviderTests", ["ui.router"]);
 
     app.config(['$uiViewScrollProvider', function($uiViewScrollProvider: ng.ui.IUiViewScrollProvider) {
@@ -227,7 +227,7 @@ interface ITestUserService {
     handleLogin: () => ng.IPromise<{}>;
 }
 
-module UrlRouterProviderTests {
+namespace UrlRouterProviderTests {
     var app = angular.module("urlRouterProviderTests", ["ui.router"]);
 
     app.config(($urlRouterProvider: ng.ui.IUrlRouterProvider) => {

angular-ui-router/angular-ui-router.d.ts

@@ -28,7 +28,7 @@ declare module 'angular-ui-router' {
     export type IType = angular.ui.IType;
 }
 
-declare module angular.ui {
+declare namespace angular.ui {
 
     interface IState {
         name?: string;
@@ -88,12 +88,12 @@ declare module angular.ui {
          * Arbitrary data object, useful for custom configuration.
          */
         data?: any;
-        
+
         /**
          * Boolean (default true). If false will not re-trigger the same state just because a search/query parameter has changed. Useful for when you'd like to modify $location.search() without triggering a reload.
          */
         reloadOnSearch?: boolean;
-        
+
         /**
          * Boolean (default true). If false will reload state on everytransitions. Useful for when you'd like to restore all data  to its initial state.
          */