Skip to content

Commit c99a575

Browse files
committed
chore(merge): forms, compiler
1 parent 3f22866 commit c99a575

File tree

7 files changed

+15
-29
lines changed

7 files changed

+15
-29
lines changed
File renamed without changes.

modules/angular2/src/core/compiler/pipeline/view_splitter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import {Parser} from 'angular2/change_detection';
77
import {CompileStep} from './compile_step';
88
import {CompileElement} from './compile_element';
99
import {CompileControl} from './compile_control';
10-
import {StringWrapper} from 'facade/src/lang';
10+
import {StringWrapper} from 'angular2/src/facade/lang';
1111

12-
import {$BANG} from 'change_detection/src/parser/lexer';
12+
import {$BANG} from 'angular2/src/change_detection/parser/lexer';
1313

1414
/**
1515
* Splits views at `<template>` elements or elements with `template` attribute:

modules/forms/src/decorators.js renamed to modules/angular2/src/forms/decorators.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {Decorator, NgElement, Ancestor} from 'core/core';
2-
import {DOM} from 'facade/src/dom';
3-
import {isPresent} from 'facade/src/lang';
4-
import {ListWrapper} from 'facade/src/collection';
1+
import {Decorator, NgElement, Ancestor} from 'angular2/core';
2+
import {DOM} from 'angular2/src/facade/dom';
3+
import {isPresent} from 'angular2/src/facade/lang';
4+
import {ListWrapper} from 'angular2/src/facade/collection';
55
import {ControlGroup, Control} from './model';
66

77
@Decorator({

modules/forms/src/model.js renamed to modules/angular2/src/forms/model.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {StringMapWrapper} from 'facade/src/collection';
1+
import {StringMapWrapper} from 'angular2/src/facade/collection';
22

33
export class Control {
44
value:any;

modules/forms/test/integration_spec.js renamed to modules/angular2/test/forms/integration_spec.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach,
2-
el, queryView, dispatchEvent} from 'test_lib/test_lib';
2+
el, queryView, dispatchEvent} from 'angular2/test_lib';
33

4-
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'change_detection/change_detection';
5-
import {Compiler, CompilerCache} from 'core/src/compiler/compiler';
6-
import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader';
7-
import {Injector} from 'di/di';
8-
import {DOM} from 'facade/src/dom';
4+
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
5+
import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
6+
import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
7+
import {Injector} from 'angular2/di';
8+
import {DOM} from 'angular2/src/facade/dom';
99

10-
import {Component, TemplateConfig} from 'core/core';
11-
import {ControlDecorator, ControlGroupDecorator, Control, ControlGroup} from 'forms/forms';
10+
import {Component, TemplateConfig} from 'angular2/core';
11+
import {ControlDecorator, ControlGroupDecorator, Control, ControlGroup} from 'angular2/forms';
1212

1313
export function main() {
1414
function detectChanges(view) {
File renamed without changes.

modules/forms/pubspec.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)