Skip to content

Commit 8a12421

Browse files
jakemac53jakemac53
committed
Merge pull request dart-archive#26 from dart-lang/htmlimport
use @HtmlImport where applicable
2 parents d76def6 + fb0c35a commit 8a12421

File tree

94 files changed

+218
-224
lines changed

Some content is hidden

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

94 files changed

+218
-224
lines changed

‎pubspec.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ packages:
6060
initialize:
6161
description: initialize
6262
source: hosted
63-
version: "0.6.0"
63+
version: "0.6.0+1"
6464
logging:
6565
description: logging
6666
source: hosted

‎web/basics/binding_to_a_complex_object/index.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
66
<script src="packages/web_components/dart_support.js"></script>
7-
<link rel="import" href="my_element.html">
87
</head>
98
<body>
109
<my-element></my-element>
11-
<script type="application/dart">export 'package:polymer/init.dart';</script>
10+
<script type="application/dart">
11+
export 'package:polymer/init.dart';
12+
import 'my_element.dart';
13+
</script>
1214
</body>
13-
</html>
15+
</html>

‎web/basics/binding_to_a_complex_object/my_element.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@HtmlImport('my_element.html')
12
library web.basics.binding_to_a_complex_object;
23

34
import 'package:polymer/polymer.dart';

‎web/basics/binding_to_a_complex_object/my_element.html‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
<link rel="import" href="packages/polymer/polymer.html">
2-
3-
<polymer-element name="my-element">
1+
<<polymer-element name="my-element">
42
<template>
53
<div>{{person.name.first}} {{person.name.last}}</div>
64
<div>{{person.title}}</div>
75
<div>{{person.company.name}}</div>
86
</template>
9-
<script type="application/dart" src="my_element.dart"></script>
107
</polymer-element>

‎web/basics/binding_to_a_field/index.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
66
<script src="packages/web_components/dart_support.js"></script>
7-
<link rel="import" href="my_element.html">
87
</head>
98
<body>
109
<my-element></my-element>
11-
<script type="application/dart">export 'package:polymer/init.dart';</script>
10+
<script type="application/dart">
11+
export 'package:polymer/init.dart';
12+
import 'my_element.dart';
13+
</script>
1214
</body>
13-
</html>
15+
</html>

‎web/basics/binding_to_a_field/my_element.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@HtmlImport('my_element.html')
12
library web.basics.binding_to_a_field;
23

34
import 'package:polymer/polymer.dart';

‎web/basics/binding_to_a_field/my_element.html‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
<link rel="import" href="packages/polymer/polymer.html">
2-
31
<polymer-element name="my-element">
42
<template>
53
<p>My favorite color is {{color}}.</p>
64
</template>
7-
<script type="application/dart" src="my_element.dart"></script>
8-
</polymer-element>
5+
</polymer-element>

‎web/basics/binding_to_a_map/index.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
66
<script src="packages/web_components/dart_support.js"></script>
7-
<link rel="import" href="my_element.html">
87
</head>
98
<body>
109
<my-element></my-element>
11-
<script type="application/dart">export 'package:polymer/init.dart';</script>
10+
<script type="application/dart">
11+
export 'package:polymer/init.dart';
12+
import 'my_element.dart';
13+
</script>
1214
</body>
13-
</html>
15+
</html>

‎web/basics/binding_to_a_map/my_element.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@HtmlImport('my_element.html')
12
library web.basics.binding_to_a_map;
23

34
import 'package:polymer/polymer.dart';

‎web/basics/binding_to_a_map/my_element.html‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
<link rel="import" href="packages/polymer/polymer.html">
2-
31
<polymer-element name="my-element">
42
<template>
53
<div>{{person['name']['first']}} {{person['name']['last']}}</div>
64
<div>{{person['title']}}</div>
75
<div>{{person['company']['name']}}</div>
86
</template>
9-
<script type="application/dart" src="my_element.dart"></script>
10-
</polymer-element>
7+
</polymer-element>

0 commit comments

Comments
 (0)