Skip to content

Commit d9820ba

Browse files
refactor(view): Update to use pluginapi
chore(*): Update to awesome-typescript-loader 3.0.0-beta.10
1 parent 29c9b17 commit d9820ba

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@types/angular-mocks": "^1.5.5",
6969
"@types/jasmine": "^2.2.34",
7070
"@types/jquery": "^1.10.31",
71-
"awesome-typescript-loader": "^2.2.4",
71+
"awesome-typescript-loader": "3.0.0-beta.10",
7272
"babel-core": "^5.8.14",
7373
"clone": "^1.0.2",
7474
"conventional-changelog": "^1.1.0",
@@ -94,7 +94,7 @@
9494
"typedoc-plugin-external-module-name": "^1.0.2",
9595
"typedoc-plugin-internal-external": "^1.0.0",
9696
"typedoc-plugin-ui-router": "^1.0.0",
97-
"typescript": "^2.1.1",
97+
"typescript": "^2.1.4",
9898
"ui-router-typedoc-themes": "^1.0.0",
9999
"watch": "^0.18.0",
100100
"webpack": "1.x",

src/directives/viewDirective.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ function $ViewDirective($view: ViewService, $animate: any, $uiViewScroll: any, $
182182
}
183183

184184
let rootData = {
185-
$cfg: { viewDecl: { $context: $view.rootContext() } },
185+
$cfg: { viewDecl: { $context: $view._pluginapi._rootViewContext() } },
186186
$uiView: { }
187187
};
188188

src/services.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ function $uiRouter($locationProvider: ILocationProvider) {
169169
router.stateRegistry.decorator("onRetain", getStateHookBuilder("onRetain"));
170170
router.stateRegistry.decorator("onEnter", getStateHookBuilder("onEnter"));
171171

172-
router.viewService.viewConfigFactory('ng1', ng1ViewConfigFactory);
172+
router.viewService._pluginapi._viewConfigFactory('ng1', ng1ViewConfigFactory);
173173

174174
// Bind LocationConfig.hashPrefix to $locationProvider.hashPrefix
175175
bindFunctions($locationProvider, services.location, $locationProvider, ['hashPrefix']);

test/ng1StateBuilderSpec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/// <reference path='../node_modules/@types/angular-mocks/index.d.ts' />
33
/// <reference path='../node_modules/@types/jasmine/index.d.ts' />
44

5-
import {StateBuilder, StateMatcher, ng1ViewsBuilder, extend} from "../src/index.ts";
5+
import {StateBuilder, StateMatcher, ng1ViewsBuilder, extend} from "../src/index";
66
import {Resolvable} from "ui-router-core";
77
declare var inject;
88

test/resolveSpec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import "./util/testUtilsNg1";
99

1010
declare var inject;
1111
import Spy = jasmine.Spy;
12-
import "./util/matchers.ts";
12+
import "./util/matchers";
1313
import { resolvedValue, resolvedError, caught } from './util/testUtilsNg1';
14-
import { ResolveContext, State, PathNode, omit, pick, extend, forEach } from "../src/index.ts";
14+
import { ResolveContext, State, PathNode, omit, pick, extend, forEach } from "../src/index";
1515
import { Resolvable, services, StateDeclaration } from "ui-router-core";
1616

1717
let module = angular['mock'].module;

test/urlRouterSpec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import "./util/matchers";
88
import { html5Compat } from './util/testUtilsNg1';
99
declare var inject;
1010

11-
import {UrlMatcher, UrlMatcherFactory, services, UrlRouterProvider, UrlRouter, StateService} from "../src/index.ts";
11+
import {UrlMatcher, UrlMatcherFactory, services, UrlRouterProvider, UrlRouter, StateService} from "../src/index";
1212

1313
var module = angular['mock'].module;
1414

test/viewSpec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ describe('view', function() {
6868

6969
state = register(stateDeclaration);
7070
let $view = new ViewService();
71-
$view.viewConfigFactory("ng1", ng1ViewConfigFactory);
71+
$view._pluginapi._viewConfigFactory("ng1", ng1ViewConfigFactory);
7272

7373
let states = [root, state];
7474
path = states.map(_state => new PathNode(_state));

0 commit comments

Comments
 (0)