Skip to content

Commit f477517

Browse files
jyasskinjyasskin
committed
Update to Polymer 0.2.0.
I duplicated rules involving '^' so they'd work in both the polyfill and native Shadow DOM. I used the 'attached' event instead of 'ready' to be sure elements are in the tree. I delayed traversals outside of the current element with 'this.async()' because apparently the currently world upgrades in a less strict order. Drive-by fix to use this.super() for upcalls. I fixed a template in titlepage.html where I'd forgotten a '}'.
1 parent 02a52ee commit f477517

26 files changed

+232
-250
lines changed

‎base.css

+11
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,29 @@ cxx-clause { page-break-before: always; }
3636
cxx-clause, cxx-toc { margin-top: 3em; }
3737
}
3838

39+
/* Rule pairs where the first has a '^' and the second doesn't, are intended
40+
* to work both with and without the Shadow DOM polyfill. TODO(jyasskin):
41+
* Figure out what the Polymer folks recommend instead of this. */
42+
3943
cxx-clause ^ header { font-size: 150%; }
44+
cxx-clause header { font-size: 150%; }
4045
cxx-toc ^ h1 { font-size: 150%; }
46+
cxx-toc h1 { font-size: 150%; }
4147
cxx-clause cxx-section ^ header { font-size: 117%; }
48+
cxx-clause cxx-section header { font-size: 117%; }
4249
cxx-clause cxx-section cxx-section ^ header { font-size: 100%; }
50+
cxx-clause cxx-section cxx-section header { font-size: 100%; }
4351

4452
[data-bookmark-label] { bookmark-label: attr(data-bookmark-label); }
4553
h1 { bookmark-level: 1; }
4654
cxx-toc ^ h1 { bookmark-level: 2; }
55+
cxx-toc h1 { bookmark-level: 2; }
4756
cxx-clause h1 { bookmark-level: 2; }
4857
cxx-clause cxx-section h1 { bookmark-level: 3; }
4958
cxx-clause cxx-section cxx-section h1 { bookmark-level: 4; }
5059

5160
* ^ .section-number { string-set: current-section "§ " content(); }
61+
* .section-number { string-set: current-section "§ " content(); }
5262

5363
p {margin-top: .5em; margin-bottom: .5em}
5464
p:first-child, ul, ol {margin-top: 0}
@@ -72,4 +82,5 @@ pre { margin-left: 1em; }
7282
@media print {
7383
/* Generate page numbers in the table of contents. */
7484
cxx-toc ^ a[href]::after { content: leader(" . ") target-counter(attr(href), page); }
85+
cxx-toc a[href]::after { content: leader(" . ") target-counter(attr(href), page); }
7586
}

‎bower_components/platform/.bower.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
],
1414
"license": "BSD",
1515
"private": true,
16-
"version": "0.1.1",
17-
"_release": "0.1.1",
16+
"version": "0.2.0",
17+
"_release": "0.2.0",
1818
"_resolution": {
1919
"type": "version",
20-
"tag": "0.1.1",
21-
"commit": "e3b25b94f9e1f51f213176e4ad07283bd56c5363"
20+
"tag": "0.2.0",
21+
"commit": "2364ac16efa5904e97c27ad8ae93a02332771343"
2222
},
2323
"_source": "git://github.com/Polymer/platform.git",
24-
"_target": "0.1.1",
24+
"_target": "0.2.0",
2525
"_originalSource": "Polymer/platform"
2626
}

‎bower_components/platform/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ Platform
22
========
33

44
Aggregated polyfills the Polymer platform.
5+
6+
[![Analytics](https://ga-beacon.appspot.com/UA-39334307-2/Polymer/platform/README)](https://github.com/igrigorik/ga-beacon)

‎bower_components/platform/bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
],
1414
"license": "BSD",
1515
"private": true,
16-
"version": "0.1.1"
16+
"version": "0.2.0"
1717
}

‎bower_components/platform/build.log

+28-27
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
11
BUILD LOG
22
---------
3-
Build Time: 2013-12-11T15:29:01
3+
Build Time: 2014-02-14T15:57:20
44

55
NODEJS INFORMATION
66
==================
7-
nodejs: v0.10.22
8-
chai: 1.8.1
9-
grunt: 0.4.1
7+
nodejs: v0.10.25
8+
chai: 1.9.0
9+
grunt: 0.4.2
1010
grunt-audit: 0.0.2
11-
grunt-concat-sourcemap: 0.3.2
11+
grunt-concat-sourcemap: 0.4.1
1212
grunt-contrib-concat: 0.3.0
13-
grunt-contrib-uglify: 0.2.7
13+
grunt-contrib-uglify: 0.3.2
1414
grunt-contrib-yuidoc: 0.5.0
1515
grunt-karma: 0.6.2
16-
karma: 0.10.4
17-
karma-chrome-launcher: 0.0.2
18-
karma-coffee-preprocessor: 0.1.0
16+
karma: 0.10.9
17+
karma-chrome-launcher: 0.1.2
18+
karma-coffee-preprocessor: 0.1.2
1919
karma-crbot-reporter: 0.0.4
20-
karma-firefox-launcher: 0.1.0
20+
karma-firefox-launcher: 0.1.3
2121
karma-html2js-preprocessor: 0.1.0
2222
karma-ie-launcher: 0.1.1
23-
karma-jasmine: 0.1.3
24-
karma-mocha: 0.1.0
25-
karma-phantomjs-launcher: 0.1.0
26-
karma-requirejs: 0.1.0
23+
karma-jasmine: 0.1.5
24+
karma-mocha: 0.1.1
25+
karma-phantomjs-launcher: 0.1.2
26+
karma-requirejs: 0.2.1
2727
karma-safari-launcher: 0.1.1
2828
karma-script-launcher: 0.1.0
29-
mocha: 1.14.0
29+
mocha: 1.17.1
30+
requirejs: 2.1.10
3031

3132
REPO REVISIONS
3233
==============
33-
CustomElements: 8f09d9d757b440617be4a9eb98556ffc999dbb83
34-
HTMLImports: 7dc0c50f38fd89411b01f6fdd98f008d276e022a
35-
NodeBind: 174b650acca7866e50024d7912941abc26ead9eb
36-
PointerEvents: 932a9b8492b8145cf87795b14c065c8b789b4afe
37-
PointerGestures: 81a379e76c605fce5844399a1137e1525bf19ef5
38-
ShadowDOM: 5df76ef6335d07a33c9cb7e69cfc8930d233ed52
39-
TemplateBinding: a647b36cb511c61e69cac58be6367ff1686d17ba
40-
WeakMap: fc7c7925546282881c6ff4d58103d6355659f56f
41-
observe-js: ac39064ea19f6c4f0fccc4c9ac7b8c9b96481c01
42-
platform: 76c8782303175f9b1b6fcbd27640f949caaa9176
43-
polymer-expressions: 5c1ab4b2213cb2cc3af7e471b1f01f3cff02a2f8
34+
CustomElements: 18efac1ed0fa054536a9efae2ddea678ddb986b1
35+
HTMLImports: 69486ed9670afe6da872ed673e8a8d0448db16a8
36+
NodeBind: eb5ee7941f712cbee755da24ab7553e2d90fb99d
37+
PointerEvents: 1d551ce7af420577f150f5c922fc54b97f04c84d
38+
PointerGestures: 0cded24896294ebecdfdad47583468f714a0a34e
39+
ShadowDOM: 308a7c2e67032f746b5e52f4e27320ffe3a57ecd
40+
TemplateBinding: 279934127f6777bdfb9f752e98eb0da172fbca1b
41+
WeakMap: a0947a9a0f58f5733f464755c3b86de624b00a5d
42+
observe-js: 3ba9aeec73f7864d519fb13c6f38cb10923cdfd9
43+
platform: 6460c3d51b30b50d311eb1d7b055f29affa26f74
44+
polymer-expressions: 470cced7cf167bd164f0b924ceb088dd7a8240b9
4445

4546
BUILD HASHES
4647
============
47-
build/platform.js: 9838767ca0b3f7b4b039cfe72df2561d6605aac1
48+
build/platform.js: d0831d90d53d03c34a5382fdace5432599c97850

‎bower_components/platform/platform.js

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bower_components/platform/platform.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bower_components/polymer-ajax/.bower.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"name": "polymer-ajax",
33
"private": true,
44
"dependencies": {
5-
"polymer": "Polymer/polymer#0.1.1"
5+
"polymer": "Polymer/polymer#0.2.0"
66
},
7-
"version": "0.1.1",
7+
"version": "0.2.0",
88
"homepage": "https://github.com/Polymer/polymer-ajax",
9-
"_release": "0.1.1",
9+
"_release": "0.2.0",
1010
"_resolution": {
1111
"type": "version",
12-
"tag": "0.1.1",
13-
"commit": "f374b0fb7bac1fe250d07c8d8d9f539a2725ad9b"
12+
"tag": "0.2.0",
13+
"commit": "ca01054c981e2480bb47c375ffb2d98d7d86807b"
1414
},
1515
"_source": "git://github.com/Polymer/polymer-ajax.git",
16-
"_target": "0.1.1",
16+
"_target": "0.2.0",
1717
"_originalSource": "Polymer/polymer-ajax",
1818
"_direct": true
1919
}

‎bower_components/polymer-ajax/bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "polymer-ajax",
33
"private": true,
44
"dependencies": {
5-
"polymer": "Polymer/polymer#0.1.1"
5+
"polymer": "Polymer/polymer#0.2.0"
66
},
7-
"version": "0.1.1"
7+
"version": "0.2.0"
88
}

‎bower_components/polymer-ajax/polymer-ajax.html

+15-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
/**
1111
* polymer-ajax can be used to perform XMLHttpRequests.
1212
*
13+
* Note: The params attribute must be double quoted JSON
14+
*
1315
* Example:
1416
*
1517
* <polymer-ajax auto url="http://gdata.youtube.com/feeds/api/videos/"
@@ -39,7 +41,7 @@
3941
<link rel="import" href="../polymer/polymer.html">
4042
<link rel="import" href="polymer-xhr.html">
4143

42-
<polymer-element name="polymer-ajax" attributes="url handleAs auto params response method headers">
44+
<polymer-element name="polymer-ajax" attributes="url handleAs auto params response method headers body contentType">
4345
<script>
4446
Polymer('polymer-ajax', {
4547
/**
@@ -130,6 +132,14 @@
130132
* @default null
131133
*/
132134
body: null,
135+
/**
136+
* Content type to use when sending data.
137+
*
138+
* @attribute contentType
139+
* @type string
140+
* @default 'application/x-www-form-urlencoded'
141+
*/
142+
contentType: 'application/x-www-form-urlencoded',
133143
ready: function() {
134144
this.xhr = document.createElement('polymer-xhr');
135145
},
@@ -214,10 +224,13 @@
214224
if (args.params && typeof(args.params) == 'string') {
215225
args.params = JSON.parse(args.params);
216226
}
217-
args.headers = this.headers || args.headers;
227+
args.headers = this.headers || args.headers || {};
218228
if (args.headers && typeof(args.headers) == 'string') {
219229
args.headers = JSON.parse(args.headers);
220230
}
231+
if (this.contentType) {
232+
args.headers['content-type'] = this.contentType;
233+
}
221234
args.callback = this.receive.bind(this);
222235
args.url = this.url;
223236
args.method = this.method;

‎bower_components/polymer-ajax/smoke.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</template>
1616

1717
<script>
18-
document.addEventListener('WebComponentsReady', function() {
18+
document.addEventListener('polymer-ready', function() {
1919
var ajax = document.querySelector("polymer-ajax");
2020
ajax.addEventListener("polymer-response",
2121
function(e) {

‎bower_components/polymer-ajax/test/html/polymer-ajax.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<script>
2020
var assert = chai.assert;
21-
document.addEventListener('WebComponentsReady', function() {
21+
document.addEventListener('polymer-ready', function() {
2222
var ajax = document.querySelector('polymer-ajax');
2323
ajax.addEventListener("polymer-response", function(event) {
2424
assert.isTrue(event.detail.response.feed.entry.length > 0);

‎bower_components/polymer/.bower.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,16 @@
1414
"polymer.js"
1515
],
1616
"dependencies": {
17-
"platform": "Polymer/platform#0.1.1"
17+
"platform": "Polymer/platform#0.2.0"
1818
},
19-
"version": "0.1.1",
20-
"_release": "0.1.1",
19+
"version": "0.2.0",
20+
"_release": "0.2.0",
2121
"_resolution": {
2222
"type": "version",
23-
"tag": "0.1.1",
24-
"commit": "a9e5f23ca0acc39e00eff7eb21b90b5e564ef1f4"
23+
"tag": "0.2.0",
24+
"commit": "ea02f956b31e8878abc9bcd8debe0e4f178a0d4b"
2525
},
2626
"_source": "git://github.com/Polymer/polymer.git",
27-
"_target": "~0.1.1",
28-
"_originalSource": "Polymer/polymer",
29-
"_direct": true
27+
"_target": "0.2.0",
28+
"_originalSource": "Polymer/polymer"
3029
}

‎bower_components/polymer/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2012 The Polymer Authors. All rights reserved.
1+
// Copyright (c) 2014 The Polymer Authors. All rights reserved.
22
//
33
// Redistribution and use in source and binary forms, with or without
44
// modification, are permitted provided that the following conditions are

‎bower_components/polymer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Polymer
22

3-
[![Polymer build status](http://www.polymer-project.org/build/polymer/status.png "Polymer build status")](http://build.chromium.org/p/client.polymer/waterfall)
3+
[![Analytics](https://ga-beacon.appspot.com/UA-39334307-2/Polymer/polymer/README)](https://github.com/igrigorik/ga-beacon)
44

55
Build Status: [http://build.chromium.org/p/client.polymer/waterfall](http://build.chromium.org/p/client.polymer/waterfall)
66

‎bower_components/polymer/bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"polymer.js"
1515
],
1616
"dependencies": {
17-
"platform": "Polymer/platform#0.1.1"
17+
"platform": "Polymer/platform#0.2.0"
1818
},
19-
"version": "0.1.1"
19+
"version": "0.2.0"
2020
}

‎bower_components/polymer/build.log

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
BUILD LOG
22
---------
3-
Build Time: 2013-12-11T17:23:40
3+
Build Time: 2014-02-14T16:12:52
44

55
NODEJS INFORMATION
66
==================
7-
nodejs: v0.10.22
8-
chai: 1.8.1
7+
nodejs: v0.10.25
8+
chai: 1.9.0
99
grunt: 0.4.2
1010
grunt-audit: 0.0.2
1111
grunt-concat-sourcemap: 0.3.2
12-
grunt-contrib-uglify: 0.2.7
12+
grunt-contrib-uglify: 0.3.2
1313
grunt-contrib-yuidoc: 0.5.0
1414
grunt-karma: 0.6.2
1515
karma: 0.10.8
16-
karma-chrome-launcher: 0.1.1
16+
karma-chrome-launcher: 0.0.2 (git://github.com/morethanreal/karma-chrome-launcher#aaaef751f4c39b4671447f4b62a3462101f8a3c4)
1717
karma-coffee-preprocessor: 0.1.1
1818
karma-crbot-reporter: 0.0.4
1919
karma-firefox-launcher: 0.1.2
@@ -25,13 +25,13 @@ karma-phantomjs-launcher: 0.1.1
2525
karma-requirejs: 0.2.0
2626
karma-safari-launcher: 0.1.1
2727
karma-script-launcher: 0.1.0
28-
mocha: 1.14.0
28+
mocha: 1.17.1
2929
requirejs: 2.1.9
3030

3131
REPO REVISIONS
3232
==============
33-
polymer-dev: e0e49e83670c6e2c6517450dc01a00c1312da5cc
33+
polymer-dev: cc80e6d0d84c268cf0df1d1b981e8e7ab8abf8be
3434

3535
BUILD HASHES
3636
============
37-
build/polymer.js: 9076953644359414eb585558b148cc8be6ae8468
37+
build/polymer.js: a4a98d5d38e01fee39486936ab2c71f506403ffc

‎bower_components/polymer/polymer-body.html

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<polymer-element name="polymer-body" extends="body">
2+
3+
<script>
4+
5+
// upgrade polymer-body last so that it can contain other imported elements
6+
document.addEventListener('polymer-ready', function() {
7+
8+
Polymer('polymer-body', Platform.mixin({
9+
10+
created: function() {
11+
this.template = document.createElement('template');
12+
var body = wrap(document).body;
13+
var c$ = body.childNodes.array();
14+
for (var i=0, c; (c=c$[i]); i++) {
15+
if (c.localName !== 'script') {
16+
this.template.content.appendChild(c);
17+
}
18+
}
19+
// snarf up user defined model
20+
window.model = this;
21+
},
22+
23+
parseDeclaration: function(elementElement) {
24+
this.lightFromTemplate(this.template);
25+
}
26+
27+
}, window.model));
28+
29+
});
30+
31+
</script>
32+
33+
</polymer-element>

‎bower_components/polymer/polymer.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
license that can be found in the LICENSE file.
55
-->
66
<script src="polymer.js"></script>
7-
<!-- <link rel="import" href="../polymer-dev/polymer.html"> -->
7+
<!-- <link rel="import" href="../polymer-dev/polymer.html"> -->
8+
<link rel="import" href="polymer-body.html">

‎bower_components/polymer/polymer.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bower_components/polymer/polymer.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)