Skip to content
This repository was archived by the owner on Mar 13, 2018. It is now read-only.

Commit 30b28ad

Browse files
dfreedmdfreedm
committed
Merge pull request #17 from Polymer/master
8/1 master -> stable
2 parents 3888e64 + 605905a commit 30b28ad

Some content is hidden

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

45 files changed

+1671
-359
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
/node_modules
2+
/docs
3+
4+
/build.bat

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "tools"]
2+
path = tools
3+
url = https://github.com/Polymer/tools.git

‎gruntfile.js

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright 2013 The Polymer Authors. All rights reserved.
3+
* Use of this source code is governed by a BSD-style
4+
* license that can be found in the LICENSE file.
5+
*/
6+
module.exports = function(grunt) {
7+
grunt.initConfig({
8+
pkg: grunt.file.readJSON('package.json'),
9+
yuidoc: {
10+
compile: {
11+
name: '<%= pkg.name %>',
12+
description: '<%= pkg.description %>',
13+
version: '<%= pkg.version %>',
14+
url: '<%= pkg.homepage %>',
15+
options: {
16+
exclude: 'docs',
17+
extension: '.js,.html',
18+
paths: '.',
19+
outdir: 'docs',
20+
linkNatives: 'true',
21+
tabtospace: 2,
22+
themedir: 'tools/doc/themes/footstrap'
23+
}
24+
}
25+
}
26+
});
27+
28+
// plugins
29+
grunt.loadNpmTasks('grunt-contrib-yuidoc');
30+
31+
// tasks
32+
grunt.registerTask('default', ['yuidoc']);
33+
grunt.registerTask('docs', ['yuidoc']);
34+
};
35+

‎manifest.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0"?>
2+
<meta>
3+
<polymer-element-meta name="polymer-ajax"></polymer-element-meta>
4+
<polymer-element-meta name="polymer-animation"></polymer-element-meta>
5+
<polymer-element-meta name="polymer-collapse"></polymer-element-meta>
6+
<polymer-element-meta name="polymer-file"></polymer-element-meta>
7+
<polymer-element-meta name="polymer-flex-layout"></polymer-element-meta>
8+
<polymer-element-meta name="polymer-google-jsapi"></polymer-element-meta>
9+
<polymer-element-meta name="polymer-grid-layout"></polymer-element-meta>
10+
<polymer-element-meta name="polymer-flex-layout"></polymer-element-meta>
11+
<polymer-element-meta name="polymer-jsonp"></polymer-element-meta>
12+
<polymer-element-meta name="polymer-key-helper"></polymer-element-meta>
13+
<polymer-element-meta name="polymer-layout"></polymer-element-meta>
14+
<polymer-element-meta name="polymer-localstorage"></polymer-element-meta>
15+
<polymer-element-meta name="polymer-media-query"></polymer-element-meta>
16+
<polymer-element-meta name="polymer-meta"></polymer-element-meta>
17+
<polymer-element-meta name="polymer-overlay"></polymer-element-meta>
18+
<polymer-element-meta name="polymer-page"></polymer-element-meta>
19+
<polymer-element-meta name="polymer-selector"></polymer-element-meta>
20+
<polymer-element-meta name="polymer-shared-lib"></polymer-element-meta>
21+
<polymer-element-meta name="polymer-view-source-link"></polymer-element-meta>
22+
</meta>

‎package.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
"name": "PolymerElements",
33
"version": "0.0.1",
44
"devDependencies": {
5-
"mocha": "*",
6-
"chai": "*",
75
"grunt": "*",
8-
"grunt-contrib-uglify": "*",
9-
"grunt-contrib-yuidoc": "*",
10-
"grunt-karma-0.9.1": "~0.4.3",
11-
"karma-mocha": "*",
12-
"karma-browserstack-launcher": "*",
13-
"karma-script-launcher": "*",
14-
"karma-crbot-reporter": "*"
6+
"grunt-contrib-yuidoc": "*"
157
}
168
}

‎polymer-ajax/polymer-xhr.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@
7979
if (params && method == 'GET') {
8080
url += (url.indexOf('?') > 0 ? '&' : '?') + params;
8181
}
82+
xhr.open(method, url, async);
8283
if (options.responseType) {
8384
xhr.responseType = options.responseType;
8485
}
85-
xhr.open(method, url, async);
8686
this.makeReadyStateHandler(xhr, options.callback);
8787
this.setRequestHeaders(options.headers);
8888
xhr.send(method == 'POST' ? (options.body || params) : null);

‎polymer-animation/index.html

Lines changed: 47 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,46 +40,71 @@
4040
<div class="animations">
4141
<polymer-animation duration="1">
4242
raw
43-
<polymer-animation-prop name="opacity" easing="ease-in-out">
44-
<polymer-animation-keyframe value="1"></polymer-animation-keyframe>
45-
<polymer-animation-keyframe value="0.3"></polymer-animation-keyframe>
46-
<polymer-animation-keyframe value="1"></polymer-animation-keyframe>
47-
</polymer-animation-prop>
43+
<polymer-animation-keyframe>
44+
<polymer-animation-prop name="opacity" value="1">
45+
</polymer-animation-prop>
46+
</polymer-animation-keyframe>
47+
<polymer-animation-keyframe>
48+
<polymer-animation-prop name="opacity" value="0.3">
49+
</polymer-animation-prop>
50+
</polymer-animation-keyframe>
51+
<polymer-animation-keyframe>
52+
<polymer-animation-prop name="opacity" value="1">
53+
</polymer-animation-prop>
54+
</polymer-animation-keyframe>
4855
</polymer-animation>
4956
<polymer-animation-group type="seq">
5057
raw group
5158
<polymer-animation duration="0.3">
52-
<polymer-animation-prop name="opacity" easing="ease-in-out">
53-
<polymer-animation-keyframe value="1"></polymer-animation-keyframe>
54-
<polymer-animation-keyframe value="0.3"></polymer-animation-keyframe>
55-
<polymer-animation-keyframe value="1"></polymer-animation-keyframe>
56-
</polymer-animation-prop>
59+
<polymer-animation-keyframe>
60+
<polymer-animation-prop name="opacity" value="1">
61+
</polymer-animation-prop>
62+
</polymer-animation-keyframe>
63+
<polymer-animation-keyframe>
64+
<polymer-animation-prop name="opacity" value="0.3">
65+
</polymer-animation-prop>
66+
</polymer-animation-keyframe>
67+
<polymer-animation-keyframe>
68+
<polymer-animation-prop name="opacity" value="1">
69+
</polymer-animation-prop>
70+
</polymer-animation-keyframe>
5771
</polymer-animation>
5872
<polymer-animation duration="0.3">
59-
<polymer-animation-prop name="transform" easing="ease-in-out">
60-
<polymer-animation-keyframe value="scale(1)"></polymer-animation-keyframe>
61-
<polymer-animation-keyframe value="scale(1.2)"></polymer-animation-keyframe>
62-
<polymer-animation-keyframe value="scale(1)"></polymer-animation-keyframe>
63-
</polymer-animation-prop>
73+
<polymer-animation-keyframe>
74+
<polymer-animation-prop name="transform" value="scale(1)">
75+
</polymer-animation-prop>
76+
</polymer-animation-keyframe>
77+
<polymer-animation-keyframe>
78+
<polymer-animation-prop name="transform" value="scale(1.2)">
79+
</polymer-animation-prop>
80+
</polymer-animation-keyframe>
81+
<polymer-animation-keyframe>
82+
<polymer-animation-prop name="transform" value="scale(1)">
83+
</polymer-animation-prop>
84+
</polymer-animation-keyframe>
6485
</polymer-animation>
6586
</polymer-animation-group>
6687
<polymer-bounce duration="1">bounce</polymer-bounce>
6788
<polymer-shake>shake</polymer-shake>
68-
<polymer-shake duration="Infinity">shake forever</polymer-shake>
89+
<!--<polymer-shake duration="Infinity">shake forever</polymer-shake>//-->
6990
<polymer-flip>flip X</polymer-flip>
7091
<polymer-flip axis="y">flip Y</polymer-flip>
7192
<polymer-blink>blink</polymer-blink>
7293
<polymer-fadein>fade in</polymer-fadein>
73-
<polymer-fadeout>fade out</polymer-fadeout>
94+
<polymer-fadeout>fade out (with event)</polymer-fadeout>
7495
</div>
7596
<script>
7697
document.addEventListener('WebComponentsReady', function() {
7798
document.querySelector('.animations').addEventListener('click',
78-
function(e) {
79-
var animation = e.target;
80-
animation.target = target;
81-
animation.play();
82-
});
99+
function(e) {
100+
var animation = e.target;
101+
animation.target = target;
102+
animation.play();
103+
});
104+
document.querySelector('polymer-fadeout').addEventListener(
105+
'complete', function(e) {
106+
alert('complete!');
107+
});
83108
});
84109
</script>
85110
</body>

‎polymer-animation/polymer-animation-group.html

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,6 @@
1212
/**
1313
* Component for a group of animations.
1414
*
15-
* A fade in and move animation in sequence:
16-
*
17-
* <polymer-animation-group type="seq">
18-
* <polymer-animation>
19-
* <polymer-animation-prop name="opacity">
20-
* <polymer-animation-keyframe value="0.5" offset="0"></polymer-animation-keyframe>
21-
* <polymer-animation-keyframe value="1" offset="1"></polymer-animation-keyframe>
22-
* <polymer-animation-prop>
23-
* </polymer-animation>
24-
* <polymer-animation>
25-
* <polymer-animation-prop name="transform">
26-
* <polymer-animation-keyframe value="translateX(0)" offset="0"></polymer-animation-keyframe>
27-
* <polymer-animation-keyframe value="translateX(100px)" offset="1"></polymer-animation-keyframe>
28-
* <polymer-animation-prop>
29-
* </polymer-animation>
30-
* </polymer-animation-group>
3115
* @class polymer-animation-group
3216
*/
3317
Polymer('polymer-animation-group', {
@@ -55,6 +39,13 @@
5539
makeAnimation: function() {
5640
return new ANIMATION_GROUPS[this.type](this.childAnimations, this.timingProps);
5741
},
42+
doOnChildren: function(inFn) {
43+
var children = this.children;
44+
if (!children.length) {
45+
children = this.webkitShadowRoot ? this.webkitShadowRoot.childNodes : [];
46+
}
47+
Array.prototype.forEach.call(children, inFn, this);
48+
},
5849
completeApply: function() {
5950
this.doOnChildren(function(c) {
6051
c.completeApply();

‎polymer-animation/polymer-animation-keyframe.html

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,28 @@
11
<polymer-element name="polymer-animation-keyframe" attributes="offset value easing">
22
<script>
33
/**
4-
* Defines the value at a keyframe for the containing `polymer-animation-prop`.
4+
* Defines a keyframe in an animation. Its children should be
5+
* `<polymer-animation-prop>` elements specifying the css
6+
* property value at the keyframe.
7+
*
58
* @class polymer-animation-keyframe
69
*/
710
/**
811
* From 0 to 1.
912
* @property offset
1013
* @type Number
11-
* @required
12-
*/
13-
/**
14-
* Property value at the animation offset.
15-
* @property value
16-
* @type String
17-
* @required
18-
*/
19-
/**
20-
* @property easing
21-
* @type String
2214
*/
2315
Polymer('polymer-animation-keyframe', {
2416
get properties() {
25-
var props = {
26-
// TODO bug in webanimations polyfill
27-
value: String(this.value) || "",
28-
};
29-
var more = this.offset !== null || this.easing;
17+
var props = {};
18+
var children = this.querySelectorAll('polymer-animation-prop');
19+
Array.prototype.forEach.call(children, function(c) {
20+
props[c.name] = c.value;
21+
});
3022
if (this.offset !== null) {
3123
props.offset = this.offset;
3224
}
33-
if (this.easing) {
34-
props.timingFunction = this.easing;
35-
}
36-
return more ? props : String(this.value);
25+
return props;
3726
}
3827
});
3928
</script>

‎polymer-animation/polymer-animation-prop.html

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
1-
<link rel="import" href="polymer-animation-keyframe.html">
2-
<polymer-element name="polymer-animation-prop" attributes="name">
1+
<polymer-element name="polymer-animation-prop" attributes="name value">
32
<script>
43
/**
5-
* An animated property. Its children should be `<polymer-animation-keyframe>`
6-
* elements specifying the keyframe values.
4+
* A CSS property and value to use in a `<polymer-animation-keyframe>`.
75
*
8-
* Declaring an property to move down and then right:
9-
*
10-
* <polymer-animation-prop name="transform">
11-
* <polymer-animation-keyframe offset="0" value="translate(0,0)"></polymer-animation-keyframe>
12-
* <polymer-animation-keyframe offset="0.5" value="translate(0,100px)"></polymer-animation-keyframe>
13-
* <polymer-animation-keyframe offset="1" value="translate(100px,100px)"></polymer-animation-keyframe>
14-
* </polymer-animation-prop>
156
* @class polymer-animation-prop
167
*/
178
/**
@@ -20,6 +11,11 @@
2011
* @type String
2112
* @required
2213
*/
23-
Polymer('polymer-animation-prop');
14+
/**
15+
* CSS property value.
16+
* @property value
17+
* @required
18+
*/
19+
Polymer('polymer-animation-prop');
2420
</script>
2521
</polymer-element>

0 commit comments

Comments
 (0)