Skip to content

Commit e69f3af

Browse files
committed
be92b1c ci(typescript): add typescript_next build
1 parent 39bd3ea commit e69f3af

File tree

62 files changed

+187
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+187
-203
lines changed

BUILD_INFO

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Wed Feb 17 00:56:18 UTC 2016
2-
17db3232576d3047425ba7f478a4e856bfc37ddf
1+
Wed Feb 17 00:56:54 UTC 2016
2+
be92b1cbe11c2f876b6b1fb451aa2aa45e8d22ba

lib/platform/browser.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
library angular2.platform.browser;
22

3+
import "dart:async";
34
export "package:angular2/src/core/angular_entrypoint.dart"
45
show AngularEntrypoint;
56
export "package:angular2/src/platform/browser_common.dart"
@@ -15,7 +16,6 @@ export "package:angular2/src/platform/browser_common.dart"
1516
enableDebugTools,
1617
disableDebugTools;
1718
import "package:angular2/src/facade/lang.dart" show Type, isPresent;
18-
import "package:angular2/src/facade/promise.dart" show Future;
1919
import "package:angular2/src/platform/browser_common.dart"
2020
show BROWSER_PROVIDERS, BROWSER_APP_COMMON_PROVIDERS;
2121
import "package:angular2/compiler.dart" show COMPILER_PROVIDERS;

lib/platform/browser_static.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
library angular2.platform.browser_static;
22

3+
import "dart:async";
34
export "package:angular2/src/core/angular_entrypoint.dart"
45
show AngularEntrypoint;
56
export "package:angular2/src/platform/browser_common.dart"
@@ -14,7 +15,6 @@ export "package:angular2/src/platform/browser_common.dart"
1415
enableDebugTools,
1516
disableDebugTools;
1617
import "package:angular2/src/facade/lang.dart" show Type, isPresent;
17-
import "package:angular2/src/facade/promise.dart" show Future;
1818
import "package:angular2/src/platform/browser_common.dart"
1919
show BROWSER_PROVIDERS, BROWSER_APP_COMMON_PROVIDERS;
2020
import "package:angular2/core.dart" show ComponentRef, platform;

lib/src/common/forms/directives/radio_control_value_accessor.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ class RadioControlValueAccessor
9393
Injector _injector;
9494
RadioButtonState _state;
9595
NgControl _control;
96-
@Input() String name;
96+
@Input()
97+
String name;
9798
Function _fn;
9899
var onChange = () {};
99100
var onTouched = () {};

lib/src/common/pipes/async_pipe.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
library angular2.src.common.pipes.async_pipe;
22

3+
import "dart:async";
34
import "package:angular2/src/facade/lang.dart"
45
show isBlank, isPresent, isPromise;
56
import "package:angular2/src/facade/async.dart"
6-
show Future, ObservableWrapper, Stream, EventEmitter;
7+
show ObservableWrapper, Stream, EventEmitter;
78
import "package:angular2/core.dart"
89
show
910
Pipe,
@@ -41,6 +42,7 @@ class PromiseStrategy {
4142

4243
var _promiseStrategy = new PromiseStrategy();
4344
var _observableStrategy = new ObservableStrategy();
45+
Future<dynamic> ___unused;
4446

4547
/**
4648
* The `async` pipe subscribes to an Observable or Promise and returns the latest value it has

lib/src/compiler/html_parser.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import "package:angular2/src/core/di.dart" show Injectable;
1515
import "html_lexer.dart" show HtmlToken, HtmlTokenType, tokenizeHtml;
1616
import "parse_util.dart" show ParseError, ParseLocation, ParseSourceSpan;
1717
import "html_tags.dart"
18-
show HtmlTagDefinition, getHtmlTagDefinition, getNsPrefix, mergeNsAndName;
18+
show HtmlTagDefinition, getHtmlTagDefinition, getNsPrefix;
1919

2020
class HtmlTreeError extends ParseError {
2121
String elementName;
@@ -252,6 +252,10 @@ class TreeBuilder {
252252
}
253253
}
254254

255+
String mergeNsAndName(String prefix, String localName) {
256+
return isPresent(prefix) ? '''@${ prefix}:${ localName}''' : localName;
257+
}
258+
255259
String getElementFullName(
256260
String prefix, String localName, HtmlElementAst parentElement) {
257261
if (isBlank(prefix)) {

lib/src/compiler/html_tags.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,3 @@ List<String> splitNsName(String elementName) {
417417
String getNsPrefix(String elementName) {
418418
return splitNsName(elementName)[0];
419419
}
420-
421-
String mergeNsAndName(String prefix, String localName) {
422-
return isPresent(prefix) ? '''@${ prefix}:${ localName}''' : localName;
423-
}

lib/src/compiler/runtime_compiler.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
library angular2.src.compiler.runtime_compiler;
22

3+
import "dart:async";
34
import "package:angular2/src/core/linker/compiler.dart"
45
show Compiler, Compiler_;
56
import "package:angular2/src/core/linker/view_ref.dart"
67
show HostViewFactoryRef, HostViewFactoryRef_;
78
import "template_compiler.dart" show TemplateCompiler;
89
import "package:angular2/src/core/di.dart" show Injectable;
910
import "package:angular2/src/facade/lang.dart" show Type;
10-
import "package:angular2/src/facade/async.dart" show Future, PromiseWrapper;
1111

1212
abstract class RuntimeCompiler extends Compiler {
1313
Future<HostViewFactoryRef> compileInHost(Type componentType);

lib/src/compiler/style_compiler.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
library angular2.src.compiler.style_compiler;
22

3+
import "dart:async";
34
import "directive_metadata.dart"
45
show CompileTypeMetadata, CompileTemplateMetadata;
56
import "source_module.dart" show SourceModule, SourceExpression, moduleRef;
67
import "package:angular2/src/core/metadata/view.dart" show ViewEncapsulation;
78
import "package:angular2/src/compiler/xhr.dart" show XHR;
89
import "package:angular2/src/facade/lang.dart"
910
show IS_DART, StringWrapper, isBlank;
10-
import "package:angular2/src/facade/async.dart" show PromiseWrapper, Future;
11+
import "package:angular2/src/facade/async.dart" show PromiseWrapper;
1112
import "package:angular2/src/compiler/shadow_css.dart" show ShadowCss;
1213
import "package:angular2/src/compiler/url_resolver.dart" show UrlResolver;
1314
import "style_url_resolver.dart" show extractStyleUrls;

lib/src/compiler/template_compiler.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
library angular2.src.compiler.template_compiler;
22

3+
import "dart:async";
34
import "package:angular2/src/facade/lang.dart"
45
show IS_DART, Type, Json, isBlank, isPresent, stringify, evalExpression;
56
import "package:angular2/src/facade/exceptions.dart" show BaseException;
67
import "package:angular2/src/facade/collection.dart"
78
show ListWrapper, SetWrapper, MapWrapper, StringMapWrapper;
8-
import "package:angular2/src/facade/async.dart" show PromiseWrapper, Future;
9+
import "package:angular2/src/facade/async.dart" show PromiseWrapper;
910
import "directive_metadata.dart"
1011
show
1112
createHostComponentMeta,

lib/src/compiler/template_normalizer.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
library angular2.src.compiler.template_normalizer;
22

3+
import "dart:async";
34
import "directive_metadata.dart"
45
show CompileTypeMetadata, CompileDirectiveMetadata, CompileTemplateMetadata;
56
import "package:angular2/src/facade/lang.dart" show isPresent, isBlank;
67
import "package:angular2/src/facade/exceptions.dart" show BaseException;
7-
import "package:angular2/src/facade/async.dart" show Future, PromiseWrapper;
8+
import "package:angular2/src/facade/async.dart" show PromiseWrapper;
89
import "package:angular2/src/compiler/xhr.dart" show XHR;
910
import "package:angular2/src/compiler/url_resolver.dart" show UrlResolver;
1011
import "style_url_resolver.dart" show extractStyleUrls, isStyleUrlResolvable;

lib/src/compiler/template_parser.dart

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import "package:angular2/src/core/change_detection/parser/ast.dart"
1414
import "directive_metadata.dart"
1515
show CompileDirectiveMetadata, CompilePipeMetadata;
1616
import "html_parser.dart" show HtmlParser;
17-
import "html_tags.dart" show splitNsName, mergeNsAndName;
17+
import "html_tags.dart" show splitNsName;
1818
import "parse_util.dart" show ParseSourceSpan, ParseError, ParseLocation;
1919
import "package:angular2/src/core/change_detection/parser/ast.dart"
2020
show RecursiveAstVisitor, BindingPipe;
@@ -666,12 +666,6 @@ class TemplateParseVisitor implements HtmlAstVisitor {
666666
} else {
667667
if (parts[0] == ATTRIBUTE_PREFIX) {
668668
boundPropertyName = parts[1];
669-
var nsSeparatorIdx = boundPropertyName.indexOf(":");
670-
if (nsSeparatorIdx > -1) {
671-
var ns = boundPropertyName.substring(0, nsSeparatorIdx);
672-
var name = boundPropertyName.substring(nsSeparatorIdx + 1);
673-
boundPropertyName = mergeNsAndName(ns, name);
674-
}
675669
bindingType = PropertyBindingType.Attribute;
676670
} else if (parts[0] == CLASS_PREFIX) {
677671
boundPropertyName = parts[1];

lib/src/compiler/xhr.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
library angular2.src.compiler.xhr;
2-
3-
import "package:angular2/src/facade/async.dart" show Future;
41
// TODO: vsavkin rename it into TemplateLoader
52

63
/**
74
* An interface for retrieving documents by URL that the compiler uses
85
* to load templates.
96
*/
7+
library angular2.src.compiler.xhr;
8+
9+
import "dart:async";
10+
1011
class XHR {
1112
Future<String> get(String url) {
1213
return null;

lib/src/compiler/xhr_mock.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
library angular2.src.compiler.xhr_mock;
22

3+
import "dart:async";
34
import "package:angular2/src/compiler/xhr.dart" show XHR;
45
import "package:angular2/src/facade/collection.dart"
56
show ListWrapper, Map, MapWrapper;
67
import "package:angular2/src/facade/lang.dart" show isBlank, isPresent;
78
import "package:angular2/src/facade/exceptions.dart"
89
show BaseException, WrappedException;
910
import "package:angular2/src/facade/async.dart"
10-
show PromiseCompleter, PromiseWrapper, Future;
11+
show PromiseCompleter, PromiseWrapper;
1112

1213
/**
1314
* A mock implementation of [XHR] that allows outgoing requests to be mocked

lib/src/core/application_ref.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
library angular2.src.core.application_ref;
22

3+
import "dart:async";
34
import "package:angular2/src/core/zone/ng_zone.dart" show NgZone;
45
import "package:angular2/src/facade/lang.dart"
56
show Type, isBlank, isPresent, assertionsEnabled, print, IS_DART;
@@ -13,7 +14,7 @@ import "application_tokens.dart"
1314
PLATFORM_INITIALIZER,
1415
APP_INITIALIZER;
1516
import "package:angular2/src/facade/async.dart"
16-
show Future, PromiseWrapper, PromiseCompleter, ObservableWrapper;
17+
show PromiseWrapper, PromiseCompleter, ObservableWrapper;
1718
import "package:angular2/src/facade/collection.dart" show ListWrapper;
1819
import "package:angular2/src/core/testability/testability.dart"
1920
show TestabilityRegistry, Testability;

lib/src/core/linker/compiler.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
library angular2.src.core.linker.compiler;
22

3+
import "dart:async";
34
import "package:angular2/src/core/linker/view_ref.dart" show HostViewFactoryRef;
45
import "package:angular2/src/core/di.dart" show Injectable;
56
import "package:angular2/src/facade/lang.dart" show Type, isBlank, stringify;
67
import "package:angular2/src/facade/exceptions.dart" show BaseException;
7-
import "package:angular2/src/facade/async.dart" show Future, PromiseWrapper;
8+
import "package:angular2/src/facade/async.dart" show PromiseWrapper;
89
import "package:angular2/src/core/reflection/reflection.dart" show reflector;
910
import "package:angular2/src/core/linker/view.dart" show HostViewFactory;
1011
import "package:angular2/src/core/linker/view_ref.dart"

lib/src/core/linker/dynamic_component_loader.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
library angular2.src.core.linker.dynamic_component_loader;
22

3+
import "dart:async";
34
import "package:angular2/src/core/di.dart"
45
show Key, Injector, ResolvedProvider, Provider, provide, Injectable;
56
import "compiler.dart" show Compiler;
67
import "package:angular2/src/facade/lang.dart"
78
show isType, Type, stringify, isPresent;
8-
import "package:angular2/src/facade/async.dart" show Future;
99
import "package:angular2/src/core/linker/view_manager.dart" show AppViewManager;
1010
import "element_ref.dart" show ElementRef, ElementRef_;
1111
import "view_ref.dart" show HostViewRef;

lib/src/facade/promise.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ library angular2.core.facade.promise;
22

33
import 'dart:async';
44
import 'dart:async' as async;
5-
export 'dart:async' show Future;
65

76
class PromiseWrapper {
87
static Future resolve(obj) => new Future.value(obj);

lib/src/mock/mock_application_ref.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
library angular2.src.mock.mock_application_ref;
22

3+
import "dart:async";
34
import "package:angular2/src/core/application_ref.dart" show ApplicationRef;
45
import "package:angular2/src/core/di.dart" show Injectable;
56
import "package:angular2/src/facade/lang.dart" show Type;
67
import "package:angular2/src/core/linker/dynamic_component_loader.dart"
78
show ComponentRef;
89
import "package:angular2/src/core/di.dart" show Provider, Injector;
910
import "package:angular2/src/core/zone/ng_zone.dart" show NgZone;
10-
import "package:angular2/src/facade/async.dart" show Future;
1111

1212
/**
1313
* A no-op implementation of [ApplicationRef], useful for testing.

lib/src/platform/browser/browser_adapter.dart

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -367,15 +367,9 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
367367
bool hasAttribute(Element element, String attribute) =>
368368
element.attributes.containsKey(attribute);
369369

370-
bool hasAttributeNS(Element element, String ns, String attribute) =>
371-
element.getAttributeNS(ns, attribute) != null;
372-
373370
String getAttribute(Element element, String attribute) =>
374371
element.getAttribute(attribute);
375372

376-
String getAttributeNS(Element element, String ns, String attribute) =>
377-
element.getAttributeNS(ns, attribute);
378-
379373
void setAttribute(Element element, String name, String value) {
380374
element.setAttribute(name, value);
381375
}
@@ -390,10 +384,6 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
390384
element.attributes.remove(name);
391385
}
392386

393-
void removeAttributeNS(Element element, String ns, String name) {
394-
element.getNamespacedAttributes(ns).remove(name);
395-
}
396-
397387
Node templateAwareRoot(Element el) => el is TemplateElement ? el.content : el;
398388

399389
HtmlDocument createHtmlDocument() =>

lib/src/platform/browser/ruler.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
library angular2.src.platform.browser.ruler;
22

3-
import "package:angular2/src/facade/async.dart" show Future, PromiseWrapper;
3+
import "dart:async";
4+
import "package:angular2/src/facade/async.dart" show PromiseWrapper;
45
import "package:angular2/src/platform/dom/dom_adapter.dart" show DomAdapter;
56
import "package:angular2/src/core/linker/element_ref.dart" show ElementRef;
67

lib/src/platform/dom/dom_adapter.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,10 @@ abstract class DomAdapter {
100100
String tagName(element);
101101
Map<String, String> attributeMap(element);
102102
bool hasAttribute(element, String attribute);
103-
bool hasAttributeNS(element, String ns, String attribute);
104103
String getAttribute(element, String attribute);
105-
String getAttributeNS(element, String ns, String attribute);
106104
setAttribute(element, String name, String value);
107105
setAttributeNS(element, String ns, String name, String value);
108106
removeAttribute(element, String attribute);
109-
removeAttributeNS(element, String ns, String attribute);
110107
templateAwareRoot(el);
111108
dynamic createHtmlDocument();
112109
dynamic defaultDoc();

lib/src/platform/dom/dom_renderer.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,10 @@ class DomRenderer implements Renderer {
203203
DOM.setAttributeNS(
204204
renderElement, attrNs, attributeName, attributeValue);
205205
} else {
206-
DOM.setAttribute(renderElement, attributeName, attributeValue);
206+
DOM.setAttribute(renderElement, nsAndName[1], attributeValue);
207207
}
208208
} else {
209-
if (isPresent(attrNs)) {
210-
DOM.removeAttributeNS(renderElement, attrNs, nsAndName[1]);
211-
} else {
212-
DOM.removeAttribute(renderElement, attributeName);
213-
}
209+
DOM.removeAttribute(renderElement, attributeName);
214210
}
215211
}
216212

lib/src/platform/dom/events/hammer_common.dart

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,15 @@ import "package:angular2/src/facade/collection.dart" show StringMapWrapper;
55

66
var _eventNames = {
77
// pan
8-
"pan": true, "panstart": true, "panmove": true, "panend": true, "pancancel":
9-
true, "panleft": true, "panright": true, "panup": true, "pandown": true,
8+
"pan": true,
9+
"panstart": true,
10+
"panmove": true,
11+
"panend": true,
12+
"pancancel": true,
13+
"panleft": true,
14+
"panright": true,
15+
"panup": true,
16+
"pandown": true,
1017
// pinch
1118
"pinch": true, "pinchstart": true, "pinchmove": true, "pinchend": true,
1219
"pinchcancel": true, "pinchin": true, "pinchout": true,

lib/src/platform/server/abstract_html_adapter.dart

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -295,21 +295,13 @@ abstract class AbstractHtml5LibAdapter implements DomAdapter {
295295
return element.attributes.keys.any((key) => '$key' == attribute);
296296
}
297297

298-
hasAttributeNS(element, String ns, String attribute) {
299-
throw 'not implemented';
300-
}
301-
302298
getAttribute(element, String attribute) {
303299
// `attributes` keys can be {@link AttributeName}s.
304300
var key = element.attributes.keys
305301
.firstWhere((key) => '$key' == attribute, orElse: () {});
306302
return element.attributes[key];
307303
}
308304

309-
getAttributeNS(element, String ns, String attribute) {
310-
throw 'not implemented';
311-
}
312-
313305
setAttribute(element, String name, String value) {
314306
element.attributes[name] = value;
315307
}
@@ -322,10 +314,6 @@ abstract class AbstractHtml5LibAdapter implements DomAdapter {
322314
element.attributes.remove(attribute);
323315
}
324316

325-
removeAttributeNS(element, String ns, String attribute) {
326-
throw 'not implemented';
327-
}
328-
329317
templateAwareRoot(el) => el;
330318

331319
createHtmlDocument() {

0 commit comments

Comments
 (0)