Skip to content

Commit 77b4297

Browse files
refactor(TemplateFactory): move to ng1/ specific dir
1 parent 0652309 commit 77b4297

File tree

5 files changed

+5
-9
lines changed

5 files changed

+5
-9
lines changed

Diff for: src/ng1/services.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {Resolvable, ResolveContext} from "../resolve/module";
2020
import {State} from "../state/module";
2121
import {trace} from "../common/trace";
2222
import {ng1ViewsBuilder, ng1ViewConfigFactory, Ng1ViewConfig} from "./viewsBuilder";
23+
import {TemplateFactory} from "./templateFactory";
2324

2425
/** @hidden */
2526
let app = angular.module("ui.router.angular1", []);
@@ -294,7 +295,7 @@ function getTransitionsProvider() {
294295
angular.module('ui.router.state').provider('$transitions', ['ng1UIRouterProvider', getTransitionsProvider]);
295296

296297
// $templateFactory service
297-
angular.module('ui.router.util').factory('$templateFactory', ['ng1UIRouter', () => router.templateFactory]);
298+
angular.module('ui.router.util').factory('$templateFactory', ['ng1UIRouter', () => new TemplateFactory()]);
298299

299300
// The $view service
300301
angular.module('ui.router').factory('$view', () => router.viewService);

Diff for: src/view/templateFactory.ts renamed to src/ng1/templateFactory.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** @module view */ /** for typedoc */
22
import {isDefined, isFunction} from "../common/predicates";
33
import {services} from "../common/coreservices";
4-
import {Ng1ViewDeclaration} from "../ng1/interface";
4+
import {Ng1ViewDeclaration} from "./interface";
55
import {IInjectable} from "../common/common";
66

77
/**

Diff for: src/ng1/viewsBuilder.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22
import {State} from "../state/stateObject";
33
import {pick, forEach, anyTrueR, unnestR} from "../common/common";
44
import {kebobString} from "../common/strings";
5-
import {ViewConfig, ViewContext} from "../view/interface";
5+
import {ViewConfig} from "../view/interface";
66
import {Ng1ViewDeclaration} from "./interface";
77
import {ViewService} from "../view/view";
88
import {isInjectable, isDefined, isString, isObject} from "../common/predicates";
99
import {services} from "../common/coreservices";
1010
import {trace} from "../common/trace";
1111
import {Node} from "../path/node";
12-
import {TemplateFactory} from "../view/templateFactory";
12+
import {TemplateFactory} from "./templateFactory";
1313
import {ResolveContext} from "../resolve/resolveContext";
14-
import {prop, parse} from "../common/hof";
1514

1615
export const ng1ViewConfigFactory = (node, view) => new Ng1ViewConfig(node, view);
1716

Diff for: src/router.ts

-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {StateProvider} from "./state/state";
55
import {stateParamsFactory, StateParams} from "./params/stateParams";
66
import {UrlRouter} from "./url/urlRouter";
77
import {TransitionService} from "./transition/transitionService";
8-
import {TemplateFactory} from "./view/templateFactory";
98
import {ViewService} from "./view/view";
109
import {StateRegistry} from "./state/stateRegistry";
1110
import {StateService} from "./state/stateService";
@@ -29,8 +28,6 @@ export class UIRouter {
2928

3029
urlRouter: UrlRouter = new UrlRouter(this.urlRouterProvider);
3130

32-
templateFactory = new TemplateFactory();
33-
3431
viewService = new ViewService();
3532

3633
transitionService: TransitionService = new TransitionService(this.viewService);

Diff for: src/view/module.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/** @module view */ /** for typedoc */
22
export * from "./interface";
3-
export * from "./templateFactory";
43
export * from "./view";

0 commit comments

Comments
 (0)