Skip to content

Commit f11f4e0

Browse files
author
Tim Blasi
committed
style(dart): Format with dartfmt v0.2.0
Format all pure Dart code with package:dart_style v0.2.0 Command: ``` find -type f -name "*.dart" | xargs dartformat -w ```
1 parent 450d363 commit f11f4e0

File tree

145 files changed

+1631
-1017
lines changed

Some content is hidden

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

145 files changed

+1631
-1017
lines changed

modules/angular2/src/core/compiler/query_list.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import './interface_query.dart';
1010
* In the future this class will implement an Observable interface.
1111
* For now it uses a plain list of observable callbacks.
1212
*/
13-
class QueryList<T> extends Object with IterableMixin<T>
13+
class QueryList<T> extends Object
14+
with IterableMixin<T>
1415
implements IQueryList<T> {
1516
List<T> _results = [];
1617
List _callbacks = [];

modules/angular2/src/core/testability/get_testability.dart

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,17 @@ import 'dart:js' as js;
1010
// Proxies a Dart function that accepts up to 10 parameters.
1111
js.JsFunction _jsFunction(Function fn) {
1212
const Object X = __varargSentinel;
13-
return new js.JsFunction.withThis((thisArg, [o1 = X, o2 = X, o3 = X, o4 = X,
14-
o5 = X, o6 = X, o7 = X, o8 = X, o9 = X, o10 = X]) {
13+
return new js.JsFunction.withThis((thisArg,
14+
[o1 = X,
15+
o2 = X,
16+
o3 = X,
17+
o4 = X,
18+
o5 = X,
19+
o6 = X,
20+
o7 = X,
21+
o8 = X,
22+
o9 = X,
23+
o10 = X]) {
1524
return __invokeFn(fn, o1, o2, o3, o4, o5, o6, o7, o8, o9, o10);
1625
});
1726
}
@@ -88,8 +97,8 @@ class GetTestability {
8897
});
8998
js.context['getAllAngularTestabilities'] = _jsify(() {
9099
List<Testability> testabilities = registry.getAllTestabilities();
91-
List<PublicTestability> publicTestabilities =
92-
testabilities.map((testability) => new PublicTestability(testability));
100+
List<PublicTestability> publicTestabilities = testabilities
101+
.map((testability) => new PublicTestability(testability));
93102
return _jsify(publicTestabilities);
94103
});
95104
}

modules/angular2/src/core/zone/ng_zone.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ class NgZone {
9494
} else {
9595
_innerZone = _createInnerZone(Zone.current,
9696
handleUncaughtError: (Zone self, ZoneDelegate parent, Zone zone,
97-
error,
98-
StackTrace trace) => _onErrorWithoutLongStackTrace(error, trace));
97+
error, StackTrace trace) =>
98+
_onErrorWithoutLongStackTrace(error, trace));
9999
}
100100
}
101101

@@ -231,7 +231,8 @@ class NgZone {
231231
_run(self, parent, zone, () => fn(arg));
232232

233233
dynamic _runBinary(Zone self, ZoneDelegate parent, Zone zone, fn(arg1, arg2),
234-
arg1, arg2) => _run(self, parent, zone, () => fn(arg1, arg2));
234+
arg1, arg2) =>
235+
_run(self, parent, zone, () => fn(arg1, arg2));
235236

236237
void _scheduleMicrotask(Zone self, ZoneDelegate parent, Zone zone, fn) {
237238
_pendingMicrotasks++;

modules/angular2/src/dom/browser_adapter.dart

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,15 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
104104
_hasPropertyCache = new Map();
105105
_setProperty = js.context.callMethod(
106106
'eval', ['(function(el, prop, value) { el[prop] = value; })']);
107-
_getProperty = js.context.callMethod(
108-
'eval', ['(function(el, prop) { return el[prop]; })']);
109-
_hasProperty = js.context.callMethod(
110-
'eval', ['(function(el, prop) { return prop in el; })']);
107+
_getProperty = js.context
108+
.callMethod('eval', ['(function(el, prop) { return el[prop]; })']);
109+
_hasProperty = js.context
110+
.callMethod('eval', ['(function(el, prop) { return prop in el; })']);
111111
}
112112
static void makeCurrent() {
113113
setRootDomAdapter(new BrowserDomAdapter());
114114
}
115+
115116
bool hasProperty(Element element, String name) {
116117
// Always return true as the serverside version html_adapter.dart does so.
117118
// TODO: change this once we have schema support.
@@ -156,10 +157,10 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
156157

157158
@override
158159
Map<String, String> get attrToPropMap => const <String, String>{
159-
'innerHtml': 'innerHTML',
160-
'readonly': 'readOnly',
161-
'tabindex': 'tabIndex',
162-
};
160+
'innerHtml': 'innerHTML',
161+
'readonly': 'readOnly',
162+
'tabindex': 'tabIndex',
163+
};
163164

164165
Element query(String selector) => document.querySelector(selector);
165166

@@ -173,29 +174,35 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
173174
// addEventListener misses zones so we use element.on.
174175
element.on[event].listen(callback);
175176
}
177+
176178
Function onAndCancel(EventTarget element, String event, callback(arg)) {
177179
// due to https://code.google.com/p/dart/issues/detail?id=17406
178180
// addEventListener misses zones so we use element.on.
179181
var subscription = element.on[event].listen(callback);
180182
return subscription.cancel;
181183
}
184+
182185
void dispatchEvent(EventTarget el, Event evt) {
183186
el.dispatchEvent(evt);
184187
}
188+
185189
MouseEvent createMouseEvent(String eventType) =>
186190
new MouseEvent(eventType, canBubble: true);
187191
Event createEvent(String eventType) => new Event(eventType, canBubble: true);
188192
void preventDefault(Event evt) {
189193
evt.preventDefault();
190194
}
195+
191196
bool isPrevented(Event evt) {
192197
return evt.defaultPrevented;
193198
}
199+
194200
String getInnerHTML(Element el) => el.innerHtml;
195201
String getOuterHTML(Element el) => el.outerHtml;
196202
void setInnerHTML(Element el, String value) {
197203
el.innerHtml = value;
198204
}
205+
199206
String nodeName(Node el) => el.nodeName;
200207
String nodeValue(Node el) => el.nodeValue;
201208
String type(InputElement el) => el.type;
@@ -208,69 +215,86 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
208215
void clearNodes(Node el) {
209216
el.nodes = const [];
210217
}
218+
211219
void appendChild(Node el, Node node) {
212220
el.append(node);
213221
}
222+
214223
void removeChild(el, Node node) {
215224
node.remove();
216225
}
226+
217227
void replaceChild(Node el, Node newNode, Node oldNode) {
218228
oldNode.replaceWith(newNode);
219229
}
230+
220231
ChildNode remove(ChildNode el) {
221232
return el..remove();
222233
}
234+
223235
void insertBefore(Node el, node) {
224236
el.parentNode.insertBefore(node, el);
225237
}
238+
226239
void insertAllBefore(Node el, Iterable<Node> nodes) {
227240
el.parentNode.insertAllBefore(nodes, el);
228241
}
242+
229243
void insertAfter(Node el, Node node) {
230244
el.parentNode.insertBefore(node, el.nextNode);
231245
}
246+
232247
String getText(Node el) => el.text;
233248
void setText(Node el, String value) {
234249
el.text = value;
235250
}
251+
236252
String getValue(el) => el.value;
237253
void setValue(el, String value) {
238254
el.value = value;
239255
}
256+
240257
bool getChecked(InputElement el) => el.checked;
241258
void setChecked(InputElement el, bool isChecked) {
242259
el.checked = isChecked;
243260
}
261+
244262
Comment createComment(String text) {
245263
return new Comment(text);
246264
}
265+
247266
TemplateElement createTemplate(String html) {
248267
var t = new TemplateElement();
249268
// We do not sanitize because templates are part of the application code
250269
// not user code.
251270
t.setInnerHtml(html, treeSanitizer: _identitySanitizer);
252271
return t;
253272
}
273+
254274
Element createElement(String tagName, [HtmlDocument doc = null]) {
255275
if (doc == null) doc = document;
256276
return doc.createElement(tagName);
257277
}
278+
258279
Text createTextNode(String text, [HtmlDocument doc = null]) {
259280
return new Text(text);
260281
}
282+
261283
createScriptTag(String attrName, String attrValue,
262284
[HtmlDocument doc = null]) {
263285
if (doc == null) doc = document;
264286
var el = doc.createElement('SCRIPT');
265287
el.setAttribute(attrName, attrValue);
266288
return el;
267289
}
290+
268291
StyleElement createStyleElement(String css, [HtmlDocument doc = null]) {
269292
if (doc == null) doc = document;
270293
var el = doc.createElement('STYLE');
271294
el.text = css;
272295
return el;
273296
}
297+
274298
ShadowRoot createShadowRoot(Element el) => el.createShadowRoot();
275299
ShadowRoot getShadowRoot(Element el) => el.shadowRoot;
276300
Element getHost(Element el) => (el as ShadowRoot).host;
@@ -283,18 +307,22 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
283307
void addClass(Element element, String classname) {
284308
element.classes.add(classname);
285309
}
310+
286311
void removeClass(Element element, String classname) {
287312
element.classes.remove(classname);
288313
}
314+
289315
bool hasClass(Element element, String classname) =>
290316
element.classes.contains(classname);
291317

292318
void setStyle(Element element, String stylename, String stylevalue) {
293319
element.style.setProperty(stylename, stylevalue);
294320
}
321+
295322
void removeStyle(Element element, String stylename) {
296323
element.style.removeProperty(stylename);
297324
}
325+
298326
String getStyle(Element element, String stylename) {
299327
return element.style.getPropertyValue(stylename);
300328
}
@@ -332,6 +360,7 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
332360
void setTitle(String newTitle) {
333361
document.title = newTitle;
334362
}
363+
335364
bool elementMatches(n, String selector) =>
336365
n is Element && n.matches(selector);
337366
bool isTemplateElement(Element el) => el is TemplateElement;
@@ -341,28 +370,34 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
341370
bool hasShadowRoot(Node node) {
342371
return node is Element && node.shadowRoot != null;
343372
}
373+
344374
bool isShadowRoot(Node node) {
345375
return node is ShadowRoot;
346376
}
377+
347378
Node importIntoDoc(Node node) {
348379
return document.importNode(node, true);
349380
}
381+
350382
Node adoptNode(Node node) {
351383
return document.adoptNode(node);
352384
}
385+
353386
bool isPageRule(CssRule rule) => rule is CssPageRule;
354387
bool isStyleRule(CssRule rule) => rule is CssStyleRule;
355388
bool isMediaRule(CssRule rule) => rule is CssMediaRule;
356389
bool isKeyframesRule(CssRule rule) => rule is CssKeyframesRule;
357390
String getHref(AnchorElement element) {
358391
return element.href;
359392
}
393+
360394
String getEventKey(KeyboardEvent event) {
361395
int keyCode = event.keyCode;
362396
return _keyCodeToKeyMap.containsKey(keyCode)
363397
? _keyCodeToKeyMap[keyCode]
364398
: 'Unidentified';
365399
}
400+
366401
getGlobalEventTarget(String target) {
367402
if (target == "window") {
368403
return window;
@@ -372,12 +407,15 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
372407
return document.body;
373408
}
374409
}
410+
375411
getHistory() {
376412
return window.history;
377413
}
414+
378415
getLocation() {
379416
return window.location;
380417
}
418+
381419
getBaseHref() {
382420
var href = getBaseElementHref();
383421
if (href == null) {
@@ -386,15 +424,19 @@ class BrowserDomAdapter extends GenericBrowserDomAdapter {
386424
var baseUri = Uri.parse(href);
387425
return baseUri.path;
388426
}
427+
389428
String getUserAgent() {
390429
return window.navigator.userAgent;
391430
}
431+
392432
void setData(Element element, String name, String value) {
393433
element.dataset[name] = value;
394434
}
435+
395436
String getData(Element element, String name) {
396437
return element.dataset[name];
397438
}
439+
398440
// TODO(tbosch): move this into a separate environment class once we have it
399441
setGlobalVar(String name, value) {
400442
js.context[name] = value;

0 commit comments

Comments
 (0)