Skip to content

Commit 4f56628

Browse files
tboschtbosch
committed
refactor(render): move services to right location
core/compiler/events -> render/dom/events core/compiler/url_resolver -> services/url_resolver core/compiler/xhr/* -> services/*
1 parent bcbf1cc commit 4f56628

39 files changed

+61
-61
lines changed

‎modules/angular2/src/core/application.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
1515
import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone';
1616
import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
1717
import {ShadowDomStrategy, NativeShadowDomStrategy, EmulatedUnscopedShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
18-
import {XHR} from 'angular2/src/core/compiler/xhr/xhr';
19-
import {XHRImpl} from 'angular2/src/core/compiler/xhr/xhr_impl';
20-
import {EventManager, DomEventsPlugin} from 'angular2/src/core/events/event_manager';
21-
import {HammerGesturesPlugin} from 'angular2/src/core/events/hammer_gestures';
18+
import {XHR} from 'angular2/src/services/xhr';
19+
import {XHRImpl} from 'angular2/src/services/xhr_impl';
20+
import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager';
21+
import {HammerGesturesPlugin} from 'angular2/src/render/dom/events/hammer_gestures';
2222
import {Binding} from 'angular2/src/di/binding';
2323
import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
24-
import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';
24+
import {UrlResolver} from 'angular2/src/services/url_resolver';
2525
import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver';
2626
import {StyleInliner} from 'angular2/src/core/compiler/style_inliner';
2727
import {CssProcessor} from 'angular2/src/core/compiler/css_processor';

‎modules/angular2/src/core/compiler/compiler.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {Template} from '../annotations/template';
1616
import {ShadowDomStrategy} from './shadow_dom_strategy';
1717
import {CompileStep} from './pipeline/compile_step';
1818
import {ComponentUrlMapper} from './component_url_mapper';
19-
import {UrlResolver} from './url_resolver';
19+
import {UrlResolver} from 'angular2/src/services/url_resolver';
2020
import {CssProcessor} from './css_processor';
2121

2222
/**

‎modules/angular2/src/core/compiler/private_component_loader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Compiler} from './compiler';
22
import {ShadowDomStrategy} from './shadow_dom_strategy';
3-
import {EventManager} from 'angular2/src/core/events/event_manager';
3+
import {EventManager} from 'angular2/src/render/dom/events/event_manager';
44
import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
55
import {Component} from 'angular2/src/core/annotations/annotations';
66
import {PrivateComponentLocation} from './private_component_location';

‎modules/angular2/src/core/compiler/private_component_location.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {NgElement} from 'angular2/src/core/dom/element';
33
import * as viewModule from './view';
44
import * as eiModule from './element_injector';
55
import {ShadowDomStrategy} from './shadow_dom_strategy';
6-
import {EventManager} from 'angular2/src/core/events/event_manager';
6+
import {EventManager} from 'angular2/src/render/dom/events/event_manager';
77
import {ListWrapper} from 'angular2/src/facade/collection';
88
import {Type} from 'angular2/src/facade/lang';
99

‎modules/angular2/src/core/compiler/style_inliner.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Injectable} from 'angular2/di';
2-
import {XHR} from 'angular2/src/core/compiler/xhr/xhr';
2+
import {XHR} from 'angular2/src/services/xhr';
33
import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver';
4-
import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';
4+
import {UrlResolver} from 'angular2/src/services/url_resolver';
55

66
import {ListWrapper} from 'angular2/src/facade/collection';
77
import {

‎modules/angular2/src/core/compiler/style_url_resolver.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import {Injectable} from 'angular2/di';
55
import {RegExp, RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang';
6-
import {UrlResolver} from './url_resolver';
6+
import {UrlResolver} from 'angular2/src/services/url_resolver';
77

88
/**
99
* Rewrites URLs by resolving '@import' and 'url()' URLs from the given base URL.

‎modules/angular2/src/core/compiler/template_loader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import {isBlank, isPresent, BaseException, stringify} from 'angular2/src/facade/
33
import {Map, MapWrapper, StringMapWrapper, StringMap} from 'angular2/src/facade/collection';
44
import {DOM} from 'angular2/src/dom/dom_adapter';
55

6-
import {XHR} from './xhr/xhr';
6+
import {XHR} from 'angular2/src/services/xhr';
77

88
import {Template} from 'angular2/src/core/annotations/template';
99

10-
import {UrlResolver} from './url_resolver';
10+
import {UrlResolver} from 'angular2/src/services/url_resolver';
1111

1212
/**
1313
* Strategy to load component templates.

‎modules/angular2/src/core/compiler/view.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {LightDom} from './shadow_dom_emulation/light_dom';
1616
import {Content} from './shadow_dom_emulation/content_tag';
1717
import {ShadowDomStrategy} from './shadow_dom_strategy';
1818
import {ViewPool} from './view_pool';
19-
import {EventManager} from 'angular2/src/core/events/event_manager';
19+
import {EventManager} from 'angular2/src/render/dom/events/event_manager';
2020

2121
const NG_BINDING_CLASS = 'ng-binding';
2222
const NG_BINDING_CLASS_SELECTOR = '.ng-binding';
@@ -306,7 +306,7 @@ export class ProtoView {
306306
parentProtoView:ProtoView;
307307
_variableBindings:List;
308308

309-
_directiveMementosMap:Map;
309+
_directiveMementosMap:Map;
310310
_directiveMementos:List;
311311

312312
constructor(
@@ -486,7 +486,7 @@ export class ProtoView {
486486
ListWrapper.push(componentChildViews, childView);
487487
}
488488
lightDoms[binderIdx] = lightDom;
489-
489+
490490
var destLightDom = null;
491491
if (isPresent(binder.parent) && binder.distanceToParent === 1) {
492492
destLightDom = lightDoms[binder.parent.index];
@@ -574,7 +574,7 @@ export class ProtoView {
574574

575575
bindElement(parent:ElementBinder, distanceToParent:int, protoElementInjector:ProtoElementInjector,
576576
componentDirective:DirectiveMetadata = null, viewportDirective:DirectiveMetadata = null):ElementBinder {
577-
var elBinder = new ElementBinder(this.elementBinders.length, parent, distanceToParent,
577+
var elBinder = new ElementBinder(this.elementBinders.length, parent, distanceToParent,
578578
protoElementInjector, componentDirective, viewportDirective);
579579
ListWrapper.push(this.elementBinders, elBinder);
580580
return elBinder;
@@ -653,18 +653,18 @@ export class ProtoView {
653653
var directiveMemento = this._getDirectiveMemento(elementIndex, directiveIndex);
654654
ListWrapper.push(this.bindingRecords, new BindingRecord(expression, bindingMemento, directiveMemento));
655655
}
656-
656+
657657
_getDirectiveMemento(elementInjectorIndex:number, directiveIndex:number) {
658658
var id = elementInjectorIndex * 100 + directiveIndex;
659659
var protoElementInjector = this.elementBinders[elementInjectorIndex].protoElementInjector;
660-
660+
661661
if (!MapWrapper.contains(this._directiveMementosMap, id)) {
662662
var binding = protoElementInjector.getDirectiveBindingAtIndex(directiveIndex);
663663
MapWrapper.set(this._directiveMementosMap, id,
664664
new DirectiveMemento(elementInjectorIndex, directiveIndex,
665665
binding.callOnAllChangesDone, binding.callOnChange));
666666
}
667-
667+
668668
return MapWrapper.get(this._directiveMementosMap, id);
669669
}
670670

‎modules/angular2/src/core/compiler/view_container.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {BaseException} from 'angular2/src/facade/lang';
55
import {Injector} from 'angular2/di';
66
import * as eiModule from 'angular2/src/core/compiler/element_injector';
77
import {isPresent, isBlank} from 'angular2/src/facade/lang';
8-
import {EventManager} from 'angular2/src/core/events/event_manager';
8+
import {EventManager} from 'angular2/src/render/dom/events/event_manager';
99
import {LightDom} from './shadow_dom_emulation/light_dom';
1010

1111
/**
@@ -88,7 +88,7 @@ export class ViewContainer {
8888
var newView = this.defaultProtoView.instantiate(this.hostElementInjector, this._eventManager);
8989
// insertion must come before hydration so that element injector trees are attached.
9090
this.insert(newView, atIndex);
91-
newView.hydrate(this.appInjector, this.hostElementInjector, this.hostLightDom,
91+
newView.hydrate(this.appInjector, this.hostElementInjector, this.hostLightDom,
9292
this.parentView.context, this.parentView.locals);
9393

9494
// new content tags might have appeared, we need to redistrubute.

‎modules/angular2/src/mock/xhr_mock.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {XHR} from 'angular2/src/core/compiler/xhr/xhr';
1+
import {XHR} from 'angular2/src/services/xhr';
22
import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
33
import {isBlank, isPresent, normalizeBlank, BaseException} from 'angular2/src/facade/lang';
44
import {PromiseWrapper, Promise} from 'angular2/src/facade/async';

0 commit comments

Comments
 (0)