@angular-wave/angular.ts 0.0.27 → 0.0.29

package/test/router/view-hook.spec.js

@@ -1,4 +1,4 @@
-import { dealoc } from "../../src/jqLite";
+import { dealoc, jqLite } from "../../src/jqLite";
 import { Angular } from "../../src/loader";
 import { publishExternalAPI } from "../../src/public";
 import { wait } from "../test-utils";
@@ -25,7 +25,7 @@ describe("view hooks", () => {
     window.angular = new Angular();
     publishExternalAPI();
     app = window.angular
-      .module("defaultModule", ["ui.router"])
+      .module("defaultModule", ["ng.router"])
       .config(($stateProvider) => {
         $stateProvider.state({ name: "foo", url: "/foo", component: "foo" });
         $stateProvider.state({ name: "bar", url: "/bar", component: "bar" });
@@ -47,7 +47,7 @@ describe("view hooks", () => {
       $state = _$state_;
       $q = _$q_;
       $timeout = _$timeout_;
-      $compile("<div><ui-view></ui-view></div>")($rootScope.$new());
+      $compile("<div><ng-view></ng-view></div>")($rootScope.$new());
     });
   });
 
@@ -103,7 +103,7 @@ describe("view hooks", () => {
     it("can redirect the transition", async () => {
       ctrl.prototype.uiCanExit = function (trans) {
         log += "canexit;";
-        return trans.router.stateService.target("baz");
+        return $state.target("baz");
       };
       await initial();
 

package/test/router/view-scroll.spec.js

@@ -1,32 +1,32 @@
-import { dealoc } from "../../src/jqLite";
+import { dealoc, jqLite } from "../../src/jqLite";
 import { Angular } from "../../src/loader";
 import { publishExternalAPI } from "../../src/public";
 import { wait } from "../test-utils";
 
-describe("uiView", () => {
+describe("ngView", () => {
   describe("scrollIntoView", () => {
-    let elem, $anchorScroll, $uiViewScroll, $timeout;
+    let elem, $anchorScroll, $ngViewScroll, $timeout;
 
     beforeEach(() => {
       dealoc(document.getElementById("dummy"));
       window.angular = new Angular();
       publishExternalAPI();
-      window.angular.module("defaultModule", ["ui.router"]);
+      window.angular.module("defaultModule", ["ng.router"]);
       let $injector = window.angular.bootstrap(
         document.getElementById("dummy"),
         ["defaultModule"],
       );
 
-      $injector.invoke((_$uiViewScroll_, _$timeout_, _$anchorScroll_) => {
+      $injector.invoke((_$ngViewScroll_, _$timeout_, _$anchorScroll_) => {
         $anchorScroll = _$anchorScroll_;
-        $uiViewScroll = _$uiViewScroll_;
+        $ngViewScroll = _$ngViewScroll_;
         $timeout = _$timeout_;
       });
       elem = [{ scrollIntoView: jasmine.createSpy("scrollIntoView") }];
     });
 
     it("should scroll element into view after timeout", async () => {
-      $uiViewScroll(elem);
+      $ngViewScroll(elem);
       expect(elem[0].scrollIntoView).not.toHaveBeenCalled();
 
       await wait(100);
@@ -34,7 +34,7 @@ describe("uiView", () => {
     });
 
     it("should return the promise from the timeout", async () => {
-      const promise = $uiViewScroll(elem);
+      const promise = $ngViewScroll(elem);
 
       await wait(100);
       expect(elem[0].scrollIntoView).toHaveBeenCalled();
@@ -43,18 +43,18 @@ describe("uiView", () => {
   });
 
   describe("useAnchorScroll", () => {
-    let elem, $anchorScroll, $uiViewScroll;
+    let elem, $anchorScroll, $ngViewScroll;
 
     beforeEach(() => {
       dealoc(document.getElementById("dummy"));
       window.angular = new Angular();
       publishExternalAPI();
-      let module = window.angular.module("defaultModule", ["ui.router"]);
-      module.config(($provide, $uiViewScrollProvider) => {
+      let module = window.angular.module("defaultModule", ["ng.router"]);
+      module.config(($provide, $ngViewScrollProvider) => {
         $provide.decorator("$anchorScroll", function ($delegate) {
           return jasmine.createSpy("$anchorScroll");
         });
-        $uiViewScrollProvider.useAnchorScroll();
+        $ngViewScrollProvider.useAnchorScroll();
       });
 
       let $injector = window.angular.bootstrap(
@@ -62,15 +62,15 @@ describe("uiView", () => {
         ["defaultModule"],
       );
 
-      $injector.invoke((_$uiViewScroll_, _$anchorScroll_) => {
+      $injector.invoke((_$ngViewScroll_, _$anchorScroll_) => {
         $anchorScroll = _$anchorScroll_;
-        $uiViewScroll = _$uiViewScroll_;
+        $ngViewScroll = _$ngViewScroll_;
       });
       elem = [{ scrollIntoView: jasmine.createSpy("scrollIntoView") }];
     });
 
     it("should call $anchorScroll", () => {
-      $uiViewScroll();
+      $ngViewScroll();
       expect($anchorScroll).toHaveBeenCalled();
     });
   });

package/test/router/view.spec.js

@@ -1,4 +1,4 @@
-import { dealoc } from "../../src/jqLite";
+import { dealoc, jqLite } from "../../src/jqLite";
 import { Angular } from "../../src/loader";
 import { publishExternalAPI } from "../../src/public";
 import { curry } from "../../src/shared/hof";
@@ -32,7 +32,7 @@ describe("view", () => {
     publishExternalAPI();
 
     window.angular
-      .module("defaultModule", ["ui.router"])
+      .module("defaultModule", ["ng.router"])
       .config(
         function (
           _$provide_,
@@ -106,7 +106,7 @@ describe("view", () => {
 
     it("uses the controllerProvider to get controller dynamically", async () => {
       $controllerProvider.register("AcmeFooController", () => {});
-      elem.append($compile("<div><ui-view></ui-view></div>")(scope));
+      elem.append($compile("<div><ng-view></ng-view></div>")(scope));
 
       const view = tail(path).views[0];
       view.load();

package/types/router/core/common/coreservices.d.ts

@@ -5,7 +5,6 @@
  * @packageDocumentation
  */
 import { IInjectable, Obj } from "./common";
-import { Disposable } from "../interface";
 import { UrlConfig, UrlService } from "../url";
 export declare const makeStub: <T>(service: string, methods: (keyof T)[]) => T;
 declare const services: CoreServices;
@@ -46,7 +45,7 @@ export interface CoreServices {
  * - [[HashLocationService]]
  * - [[MemoryLocationService]]
  */
-export interface LocationServices extends Disposable {
+export interface LocationServices {
   /** See: [[UrlService.url]] */ url: UrlService["url"];
   /** See: [[UrlService.path]] */ path: UrlService["path"];
   /** See: [[UrlService.search]] */ search: UrlService["search"];
@@ -67,7 +66,7 @@ export interface LocationServices extends Disposable {
  * - [[BrowserLocationConfig]]
  * - [[MemoryLocationConfig]]
  */
-export interface LocationConfig extends Disposable {
+export interface LocationConfig {
   /** See: [[UrlConfig.port]] */ port: UrlConfig["port"];
   /** See: [[UrlConfig.protocol]] */ protocol: UrlConfig["protocol"];
   /** See: [[UrlConfig.host]] */ host: UrlConfig["host"];

package/types/router/core/globals.d.ts

@@ -3,14 +3,12 @@ import { StateDeclaration } from "./state/interface";
 import { StateObject } from "./state/stateObject";
 import { Transition } from "./transition/transition";
 import { Queue } from "./common/queue";
-import { Disposable } from "./interface";
-/**
  * Global router state
  *
  * This is where we hold the global mutable state such as current state, current
  * params, current transition, etc.
  */
-export declare class UIRouterGlobals implements Disposable {
+export declare class UIRouterGlobals {
   /**
    * Current parameter values
    *
@@ -41,5 +39,4 @@ export declare class UIRouterGlobals implements Disposable {
   transitionHistory: Queue<Transition>;
   /** @internal */
   successfulTransitions: Queue<Transition>;
-  dispose(): void;
 }

package/types/router/core/interface.d.ts

@@ -89,16 +89,10 @@ export interface UIInjector {
   getNative(token: any): any;
   getNative<T>(token: any): T;
 }
-export interface UIRouterPlugin extends Disposable {
+export interface UIRouterPlugin {
   name: string;
 }
-export declare abstract class UIRouterPluginBase
-  implements UIRouterPlugin, Disposable
-{
+export declare abstract class UIRouterPluginBase implements UIRouterPlugin {
   abstract name: string;
   dispose(router: UIRouter): void;
 }
-export interface Disposable {
-  /** Instructs the Disposable to clean up any resources */
-  dispose(router?: UIRouter): any;
-}

package/types/router/core/params/paramTypes.d.ts

@@ -179,7 +179,6 @@ export declare class ParamTypes {
   typeQueue: any[];
   private defaultTypes;
   constructor();
-  dispose(): void;
   /**
    * Registers a parameter type
    *

package/types/router/core/router.d.ts

@@ -5,7 +5,7 @@ import { ViewService } from "./view/view";
 import { StateRegistry } from "./state/stateRegistry";
 import { StateService } from "./state/stateService";
 import { UIRouterGlobals } from "./globals";
-import { UIRouterPlugin, Disposable } from "./interface";
+import { UIRouterPlugin } from "./interface";
 import { UrlService } from "./url/urlService";
 import { LocationServices, LocationConfig } from "./common/coreservices";
 import { Trace } from "./common/trace";
@@ -46,8 +46,7 @@ export declare class UIRouter {
   stateService: StateService;
   /** @internal plugin instances are registered here */
   private _plugins;
-  /** Registers an object to be notified when the router is disposed */
-  disposable(disposable: Disposable): void;
+
   /**
    * Disposes this router instance
    *

package/types/router/core/state/interface.d.ts

@@ -42,20 +42,20 @@ export interface _ViewDeclaration {
   /**
    * The normalized address for the `ui-view` which this ViewConfig targets.
    *
-   * A ViewConfig targets a `ui-view` in the DOM (relative to the `uiViewContextAnchor`) which has
+   * A ViewConfig targets a `ui-view` in the DOM (relative to the `ngViewContextAnchor`) which has
    * a specific name.
    * @example `header` or `$default`
    *
-   * The `uiViewName` can also target a _nested view_ by providing a dot-notation address
+   * The `ngViewName` can also target a _nested view_ by providing a dot-notation address
    * @example `foo.bar` or `foo.$default.bar`
    */
-  $uiViewName?: string;
+  $ngViewName?: string;
   /**
-   * The normalized context anchor (state name) for the `uiViewName`
+   * The normalized context anchor (state name) for the `ngViewName`
    *
-   * When targeting a `ui-view`, the `uiViewName` address is anchored to a context name (state name).
+   * When targeting a `ui-view`, the `ngViewName` address is anchored to a context name (state name).
    */
-  $uiViewContextAnchor?: string;
+  $ngViewContextAnchor?: string;
   /**
    * A type identifier for the View
    *

package/types/router/core/state/stateQueueManager.d.ts

@@ -2,9 +2,8 @@ import { _StateDeclaration } from "./interface";
 import { StateObject } from "./stateObject";
 import { StateBuilder } from "./stateBuilder";
 import { StateRegistryListener } from "./stateRegistry";
-import { Disposable } from "../interface";
 import { UIRouter } from "../router";
-export declare class StateQueueManager implements Disposable {
+export declare class StateQueueManager {
   private router;
   states: {
     [key: string]: StateObject;
@@ -20,7 +19,6 @@ export declare class StateQueueManager implements Disposable {
     builder: StateBuilder,
     listeners: StateRegistryListener[],
   );
-  dispose(): void;
   register(stateDecl: _StateDeclaration): StateObject;
   flush(): {
     [key: string]: StateObject;

package/types/router/core/state/stateRegistry.d.ts

@@ -23,6 +23,7 @@ export declare type StateRegistryListener = (
  * This API is found at `router.stateRegistry` ([[UIRouter.stateRegistry]])
  */
 export declare class StateRegistry {
+  init($injector: any): void;
   private router;
   private _root;
   private states;
@@ -37,8 +38,6 @@ export declare class StateRegistry {
   constructor(router: UIRouter);
   /** @internal */
   private _registerRoot;
-  /** @internal */
-  dispose(): void;
   /**
    * Listen for a State Registry events
    *

package/types/router/core/state/stateService.d.ts

@@ -53,8 +53,7 @@ export declare class StateService {
   $current: StateObject;
   /** @internal */
   constructor(/** @internal */ router: UIRouter);
-  /** @internal */
-  dispose(): void;
+
   /**
    * Handler for when [[transitionTo]] is called with an invalid state.
    *
@@ -100,7 +99,7 @@ export declare class StateService {
    *
    * #### Example:
    * ```js
-   * let app angular.module('app', ['ui.router']);
+   * let app angular.module('app', ['ng.router']);
    *
    * app.controller('ctrl', function ($scope, $state) {
    *   $scope.reload = function(){
@@ -124,7 +123,7 @@ export declare class StateService {
    * ```js
    * //assuming app application consists of 3 states: 'contacts', 'contacts.detail', 'contacts.detail.item'
    * //and current state is 'contacts.detail.item'
-   * let app angular.module('app', ['ui.router']);
+   * let app angular.module('app', ['ng.router']);
    *
    * app.controller('ctrl', function ($scope, $state) {
    *   $scope.reload = function(){
@@ -150,7 +149,7 @@ export declare class StateService {
    *
    * #### Example:
    * ```js
-   * let app = angular.module('app', ['ui.router']);
+   * let app = angular.module('app', ['ng.router']);
    *
    * app.controller('ctrl', function ($scope, $state) {
    *   $scope.changeState = function () {
@@ -203,7 +202,7 @@ export declare class StateService {
    *
    * #### Example:
    * ```js
-   * let app = angular.module('app', ['ui.router']);
+   * let app = angular.module('app', ['ng.router']);
    *
    * app.controller('ctrl', function ($scope, $state) {
    *   $scope.changeState = function () {

package/types/router/core/transition/interface.d.ts

@@ -9,7 +9,7 @@ import { RegisteredHook } from "./hookRegistry";
  * The TransitionOptions object can be used to change the behavior of a transition.
  *
  * It is passed as the third argument to [[StateService.go]], [[StateService.transitionTo]].
- * It can also be used with a `uiSref`.
+ * It can also be used with a `ngSref`.
  */
 export interface TransitionOptions {
   /**
@@ -327,7 +327,7 @@ export interface IHookRegistry {
    * ```js
    * // ng2
    * transitionService.onBefore({ to: 'home' }, (trans: Transition) =>
-   *     trans.router.stateService.target("home.dashboard"));
+   *     stateService.target("home.dashboard"));
    * ```
    *
    * #### Data Driven Default Substate
@@ -354,7 +354,7 @@ export interface IHookRegistry {
    *
    * $transitions.onBefore(criteria, function(trans: Transition) {
    *   var substate = trans.to().defaultSubstate;
-   *   return trans.router.stateService.target(substate);
+   *   return stateService.target(substate);
    * });
    * ```
    *
@@ -429,7 +429,7 @@ export interface IHookRegistry {
    * ```js
    * // ng1
    * $transitions.onStart( { to: 'auth.**' }, function(trans) {
-   *   var $state = trans.router.stateService;
+   *   var $state = stateService;
    *   var MyAuthService = trans.injector().get('MyAuthService');
    *
    *   // If the user is not authenticated

package/types/router/core/transition/transitionService.d.ts

@@ -20,7 +20,6 @@ import { ViewService } from "../view/view";
 import { UIRouter } from "../router";
 import { TransitionEventType } from "./transitionEventType";
 import { GetResultHandler, GetErrorHandler } from "./transitionHook";
-import { Disposable } from "../interface";
 /**
  * The default [[Transition]] options.
  *
@@ -82,7 +81,7 @@ export interface TransitionServicePluginAPI {
  *
  * This API is located at `router.transitionService` ([[UIRouter.transitionService]])
  */
-export declare class TransitionService implements IHookRegistry, Disposable {
+export declare class TransitionService implements IHookRegistry {
   /** @internal */
   _transitionCount: number;
   /** @internal */

package/types/router/core/url/urlConfig.d.ts

@@ -1,4 +1,3 @@
-import { Disposable } from "../interface";
 import { UIRouter } from "../router";
 import { ParamTypeDefinition, ParamTypes } from "../params";
 /**
@@ -14,7 +13,7 @@ import { ParamTypeDefinition, ParamTypes } from "../params";
  *
  * This API is found at `router.urlService.config` (see: [[UIRouter.urlService]], [[URLService.config]])
  */
-export declare class UrlConfig implements Disposable {
+export declare class UrlConfig {
   private router;
   /** @internal */ paramTypes: ParamTypes;
   /** @internal */ _decodeParams: boolean;

package/types/router/core/url/urlRules.d.ts

@@ -1,5 +1,4 @@
 import { UIRouter } from "../router";
-import { Disposable } from "../interface";
 import { UrlRule, UrlRuleHandlerFn } from "./interface";
 import { TargetState, TargetStateDef } from "../state";
 import { UrlMatcher } from "./urlMatcher";
@@ -14,7 +13,7 @@ import { UrlRuleFactory } from "./urlRule";
  *
  * This API is found at `router.urlService.rules` (see: [[UIRouter.urlService]], [[URLService.rules]])
  */
-export declare class UrlRules implements Disposable {
+export declare class UrlRules {
   private router;
   /** used to create [[UrlRule]] objects for common cases */
   urlRuleFactory: UrlRuleFactory;

package/types/router/core/url/urlService.d.ts

@@ -24,8 +24,7 @@ export declare class UrlService implements LocationServices, UrlSyncApi {
   config: UrlConfig;
   /** @internal */
   constructor(/** @internal */ router: UIRouter);
-  /** @internal */
-  dispose(): void;
+
   /**
    * Gets the current URL parts
    *

package/types/router/core/view/interface.d.ts

@@ -31,8 +31,8 @@ export interface ActiveUIView {
  * with the `ViewConfig`.  The `ui-view` then loads itself using the information found in the `ViewConfig`.
  *
  * A `ViewConfig` if matched with a `ui-view` by finding all `ui-view`s which were created in the
- * context named by the `uiViewContextAnchor`, and finding the `ui-view` or child `ui-view` that matches
- * the `uiViewName` address.
+ * context named by the `ngViewContextAnchor`, and finding the `ui-view` or child `ui-view` that matches
+ * the `ngViewName` address.
  */
 export interface ViewConfig {
   $id: number;

package/types/router/core/view/view.d.ts

@@ -10,14 +10,14 @@ export declare type ViewConfigFactory = (
 export interface ViewServicePluginAPI {
   _rootViewContext(context?: ViewContext): ViewContext;
   _viewConfigFactory(viewType: string, factory: ViewConfigFactory): any;
-  /** @param id router.$id + "." + uiView.id */
+  /** @param id router.$id + "." + ngView.id */
   _registeredUIView(id: string): ActiveUIView;
   _registeredUIViews(): ActiveUIView[];
   _activeViewConfigs(): ViewConfig[];
   _onSync(listener: ViewSyncListener): Function;
 }
 export interface ViewTuple {
-  uiView: ActiveUIView;
+  ngView: ActiveUIView;
   viewConfig: ViewConfig;
 }
 export interface ViewSyncListener {
@@ -41,7 +41,7 @@ export interface ViewSyncListener {
  */
 export declare class ViewService {
   private router;
-  /** @internal */ private _uiViews;
+  /** @internal */ private _ngViews;
   /** @internal */ private _viewConfigs;
   /** @internal */ private _rootContext;
   /** @internal */ private _viewConfigFactories;
@@ -81,7 +81,7 @@ export declare class ViewService {
    *   </ui-view>
    * </ui-view>
    *
-   * uiViews: [
+   * ngViews: [
    *  { fqn: "$default",                  creationContext: { name: "" } },
    *  { fqn: "$default.foo",              creationContext: { name: "A" } },
    *  { fqn: "$default.foo.$default",     creationContext: { name: "A.B" } }
@@ -90,10 +90,10 @@ export declare class ViewService {
    *
    * These four view configs all match the ui-view with the fqn: "$default.foo.$default.bar":
    *
-   * - ViewConfig1: { uiViewName: "bar",                       uiViewContextAnchor: "A.B.C" }
-   * - ViewConfig2: { uiViewName: "$default.bar",              uiViewContextAnchor: "A.B" }
-   * - ViewConfig3: { uiViewName: "foo.$default.bar",          uiViewContextAnchor: "A" }
-   * - ViewConfig4: { uiViewName: "$default.foo.$default.bar", uiViewContextAnchor: "" }
+   * - ViewConfig1: { ngViewName: "bar",                       ngViewContextAnchor: "A.B.C" }
+   * - ViewConfig2: { ngViewName: "$default.bar",              ngViewContextAnchor: "A.B" }
+   * - ViewConfig3: { ngViewName: "foo.$default.bar",          ngViewContextAnchor: "A" }
+   * - ViewConfig4: { ngViewName: "$default.foo.$default.bar", ngViewContextAnchor: "" }
    *
    * Using ViewConfig3 as an example, it matches the ui-view with fqn "$default.foo.$default.bar" because:
    * - The ViewConfig's segmented target name is: [ "foo", "$default", "bar" ]
@@ -106,26 +106,26 @@ export declare class ViewService {
    * @internal
    */
   static matches: (
-    uiViewsByFqn: TypedMap<ActiveUIView>,
-    uiView: ActiveUIView,
+    ngViewsByFqn: TypedMap<ActiveUIView>,
+    ngView: ActiveUIView,
   ) => (viewConfig: ViewConfig) => boolean;
   /**
    * Normalizes a view's name from a state.views configuration block.
    *
    * This should be used by a framework implementation to calculate the values for
-   * [[_ViewDeclaration.$uiViewName]] and [[_ViewDeclaration.$uiViewContextAnchor]].
+   * [[_ViewDeclaration.$ngViewName]] and [[_ViewDeclaration.$ngViewContextAnchor]].
    *
    * @param context the context object (state declaration) that the view belongs to
    * @param rawViewName the name of the view, as declared in the [[StateDeclaration.views]]
    *
-   * @returns the normalized uiViewName and uiViewContextAnchor that the view targets
+   * @returns the normalized ngViewName and ngViewContextAnchor that the view targets
    */
   static normalizeUIViewTarget(
     context: ViewContext,
     rawViewName?: string,
   ): {
-    uiViewName: string;
-    uiViewContextAnchor: string;
+    ngViewName: string;
+    ngViewContextAnchor: string;
   };
   /** @internal */
   constructor(/** @internal */ router: UIRouter);
@@ -157,10 +157,10 @@ export declare class ViewService {
    * Note: There is no corresponding `deregisterUIView`.
    *       A `ui-view` should hang on to the return value of `registerUIView` and invoke it to deregister itself.
    *
-   * @param uiView The metadata for a UIView
+   * @param ngView The metadata for a UIView
    * @return a de-registration function used when the view is destroyed.
    */
-  registerUIView(uiView: ActiveUIView): () => void;
+  registerUIView(ngView: ActiveUIView): () => void;
   /**
    * Returns the list of views currently available on the page, by fully-qualified name.
    *

package/types/router/directives/viewDirective.d.ts

@@ -6,7 +6,7 @@ import { Ng1ViewConfig } from "../statebuilders/views";
 /** @hidden */
 export declare type UIViewData = {
   $cfg: Ng1ViewConfig;
-  $uiView: ActiveUIView;
+  $ngView: ActiveUIView;
 };
 /** @hidden */
 export declare type UIViewAnimData = {
@@ -27,7 +27,7 @@ export declare type UIViewAnimData = {
  *   The ui-view can be targeted in a View using the name ([[Ng1StateDeclaration.views]]).
  *
  * - `autoscroll`: an expression. When it evaluates to true, the `ui-view` will be scrolled into view when it is activated.
- *   Uses [[$uiViewScroll]] to do the scrolling.
+ *   Uses [[$ngViewScroll]] to do the scrolling.
  *
  * - `onload`: Expression to evaluate whenever the view updates.
  *
@@ -141,4 +141,4 @@ export declare type UIViewAnimData = {
  * });
  * ```
  */
-export declare let uiView: IDirective;
+export declare let ngView: IDirective;

package/types/router/interface.d.ts

@@ -251,7 +251,7 @@ export interface Ng1ViewDeclaration extends _ViewDeclaration {
    * A property of [[Ng1StateDeclaration]] or [[Ng1ViewDeclaration]]:
    *
    * The controller function, or the name of a registered controller.  The controller function will be used
-   * to control the contents of the [[directives.uiView]] directive.
+   * to control the contents of the [[directives.ngView]] directive.
    *
    * If specified as a string, controllerAs can be declared here, i.e., "FooController as foo" instead of in
    * a separate [[controllerAs]] property.
@@ -310,7 +310,7 @@ export interface Ng1ViewDeclaration extends _ViewDeclaration {
    * A property of [[Ng1StateDeclaration]] or [[Ng1ViewDeclaration]]:
    *
    * HTML template as a string, or a function which returns an html template as a string.
-   * This template will be used to render the corresponding [[directives.uiView]] directive.
+   * This template will be used to render the corresponding [[directives.ngView]] directive.
    *
    * This property takes precedence over templateUrl.
    *
@@ -335,7 +335,7 @@ export interface Ng1ViewDeclaration extends _ViewDeclaration {
    * A property of [[Ng1StateDeclaration]] or [[Ng1ViewDeclaration]]:
    *
    * A path or a function that returns a path to an html template.
-   * The template will be fetched and used to render the corresponding [[directives.uiView]] directive.
+   * The template will be fetched and used to render the corresponding [[directives.ngView]] directive.
    *
    * If `templateUrl` is a function, it will be called with the Transition parameters as the first argument.
    *
@@ -358,7 +358,7 @@ export interface Ng1ViewDeclaration extends _ViewDeclaration {
    * A property of [[Ng1StateDeclaration]] or [[Ng1ViewDeclaration]]:
    *
    * Injected function which returns the HTML template.
-   * The template will be used to render the corresponding [[directives.uiView]] directive.
+   * The template will be used to render the corresponding [[directives.ngView]] directive.
    *
    * #### Example:
    * ```js

package/types/router/locationServices.d.ts

@@ -35,7 +35,6 @@ export declare class Ng1LocationServices
    * @param router
    */
   static monkeyPatchPathParameterType(router: UIRouter): void;
-  dispose(): void;
   constructor($locationProvider: ILocationProvider);
   onChange(callback: Function): () => Function[];
   html5Mode(): any;

package/types/router/stateProvider.d.ts

@@ -56,7 +56,7 @@ export declare class StateProvider {
    * - **parent** `{object}` - returns the parent state object.
    * - **data** `{object}` - returns state data, including any inherited data that is not
    *   overridden by own values (if any).
-   * - **url** `{object}` - returns a {@link ui.router.util.type:UrlMatcher UrlMatcher}
+   * - **url** `{object}` - returns a {@link ng.router.util.type:UrlMatcher UrlMatcher}
    *   or `null`.
    * - **navigable** `{object}` - returns closest ancestor state that has a URL (aka is
    *   navigable).
@@ -127,7 +127,7 @@ export declare class StateProvider {
    * <a id='template'></a>
    *
    * - **`template`** - {string|function=} - html template as a string or a function that returns
-   *   an html template as a string which should be used by the uiView directives. This property
+   *   an html template as a string which should be used by the ngView directives. This property
    *   takes precedence over templateUrl.
    *
    *   If `template` is a function, it will be called with the following parameters:
@@ -138,7 +138,7 @@ export declare class StateProvider {
    * <a id='templateUrl'></a>
    *
    * - **`templateUrl`** - {string|function=} - path or function that returns a path to an html
-   *   template that should be used by uiView.
+   *   template that should be used by ngView.
    *
    *   If `templateUrl` is a function, it will be called with the following parameters:
    *