Merge branch 'master' of https://github.com/angular-ui/ui-router

angular-ui · Nov 18, 2014 · 7cfd9d6 · 7cfd9d6
2 parents dcb31b8 + 9129fe5
commit 7cfd9d6
Showing 1 changed file with 15 additions and 28 deletions.
diff --git a/api/angular-ui-router.d.ts b/api/angular-ui-router.d.ts
@@ -15,29 +15,16 @@ declare module ng.ui {
         controllerProvider?: any;
         resolve?: {};
         url?: string;
-        params?: any[];
+        params?: any;
         views?: {};
         abstract?: boolean;
         onEnter?: (...args: any[]) => void;
         onExit?: (...args: any[]) => void;
         data?: any;
+        reloadOnSearch?: boolean;
     }
-
-    interface ITypedState<T> {
-        name?: string;
-        template?: string;
-        templateUrl?: string;
-        templateProvider?: () => string;
-        controller?: any;
-        controllerAs?: string;    
-        controllerProvider?: any;
-        resolve?: {};
-        url?: string;
-        params?: any[];
-        views?: {};
-        abstract?: boolean;
-        onEnter?: (...args: any[]) => void;
-        onExit?: (...args: any[]) => void;
+
+    interface ITypedState<T> extends IState {
         data?: T;
     }
 
@@ -116,19 +103,19 @@ declare module ng.ui {
     }
 
     interface IUrlRouterService {
-    	/*
-    	 * Triggers an update; the same update that happens when the address bar
-    	 * url changes, aka $locationChangeSuccess.
-    	 *
-    	 * This method is useful when you need to use preventDefault() on the
-    	 * $locationChangeSuccess event, perform some custom logic (route protection,
-    	 * auth, config, redirection, etc) and then finally proceed with the transition
-    	 * by calling $urlRouter.sync().
-    	 *
-    	 */
+        /*
+         * Triggers an update; the same update that happens when the address bar
+         * url changes, aka $locationChangeSuccess.
+         *
+         * This method is useful when you need to use preventDefault() on the
+         * $locationChangeSuccess event, perform some custom logic (route protection,
+         * auth, config, redirection, etc) and then finally proceed with the transition
+         * by calling $urlRouter.sync().
+         *
+         */
         sync(): void;
     }
-    
+
     interface IUiViewScrollProvider {
         /*
          * Reverts back to using the core $anchorScroll service for scrolling