Skip to content

Commit b0d0fb6

Browse files
cdatacdata
committed
Merge pull request #10 from PolymerElements/update-for-0.9
Update for 0.9
2 parents 958adc3 + 78e075e commit b0d0fb6

3 files changed

+61
-58
lines changed

‎bower.json

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"name": "paper-behaviors",
3-
"version": "0.8.0",
3+
"version": "0.9.0",
44
"authors": [
55
"The Polymer Authors"
66
],
7+
"main": [
8+
"paper-button-behavior.html",
9+
"paper-radio-button-behavior.html"
10+
],
711
"keywords": [
812
"web-components",
913
"web-component",
@@ -16,18 +20,17 @@
1620
},
1721
"license": "MIT",
1822
"homepage": "https://github.com/PolymerElements/paper-behaviors",
19-
"ignore": [
20-
],
2123
"dependencies": {
22-
"polymer": "polymer/polymer#v0.8.0-rc.7",
23-
"iron-behaviors": "PolymerElements/iron-behaviors#^0.8.0"
24+
"polymer": "polymer/polymer#v0.9.0-rc.1",
25+
"iron-behaviors": "PolymerElements/iron-behaviors#^0.9.0"
2426
},
2527
"devDependencies": {
26-
"paper-material": "PolymerElements/paper-material#^0.8.0",
27-
"paper-ripple": "PolymerElements/paper-ripple#^0.8.0",
28-
"iron-test-helpers": "polymerelements/iron-test-helpers#^0.8.0",
28+
"iron-component-page": "polymerelements/iron-component-page#^0.9.0",
29+
"iron-test-helpers": "polymerelements/iron-test-helpers#^0.9.0",
30+
"paper-material": "PolymerElements/paper-material#^0.9.0",
31+
"paper-ripple": "PolymerElements/paper-ripple#^0.9.0",
32+
"test-fixture": "PolymerElements/test-fixture#^0.9.0",
2933
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.6.0",
30-
"web-component-tester": "Polymer/web-component-tester#^2.2.3",
31-
"test-fixture": "PolymerElements/test-fixture#^0.8.0"
34+
"web-component-tester": "*"
3235
}
3336
}

‎paper-radio-button-behavior.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525

2626
if (focused) {
2727
var rect = this.$.ink.getBoundingClientRect();
28-
this.$.ink.mousedownAction();
28+
this.$.ink.downAction();
2929
} else {
30-
this.$.ink.mouseupAction();
30+
this.$.ink.upAction();
3131
}
3232
}
3333

‎test/paper-radio-button-behavior.html

+46-46
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,52 @@
1010
-->
1111

1212
<html>
13-
<head>
14-
<title>paper-radio-button-behavior</title>
15-
16-
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
17-
<script src="../../web-component-tester/browser.js"></script>
18-
<script src="../../test-fixture/test-fixture-mocha.js"></script>
19-
<script src="../../iron-test-helpers/mock-interactions.js"></script>
20-
21-
<link rel="import" href="../../polymer/polymer.html">
22-
<link rel="import" href="../../test-fixture/test-fixture.html">
23-
<link rel="import" href="test-radio-button.html">
24-
</head>
25-
<body>
26-
27-
<test-fixture id="basic">
28-
<template>
29-
<test-radio-button></test-radio-button>
30-
</template>
31-
</test-fixture>
32-
33-
<script>
34-
suite('basic', function() {
35-
var button;
36-
var ink;
37-
38-
setup(function() {
39-
button = fixture('basic');
40-
ink = button.querySelector('paper-ripple');
41-
MockInteractions.blur(button);
42-
});
43-
44-
test('normal (no states)', function() {
45-
assert.isFalse(button.focused);
46-
assert.isFalse(ink._animating);
47-
assert.equal(ink.ripples.length, 0);
48-
});
49-
50-
test('receives focus', function() {
51-
MockInteractions.focus(button);
52-
53-
assert.isTrue(button.focused);
54-
assert.isTrue(ink._animating);
55-
assert.equal(ink.ripples.length, 1);
56-
});
13+
<head>
14+
<title>paper-radio-button-behavior</title>
15+
16+
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
17+
<script src="../../web-component-tester/browser.js"></script>
18+
<script src="../../test-fixture/test-fixture-mocha.js"></script>
19+
<script src="../../iron-test-helpers/mock-interactions.js"></script>
20+
21+
<link rel="import" href="../../polymer/polymer.html">
22+
<link rel="import" href="../../test-fixture/test-fixture.html">
23+
<link rel="import" href="test-radio-button.html">
24+
</head>
25+
<body>
26+
27+
<test-fixture id="basic">
28+
<template>
29+
<test-radio-button></test-radio-button>
30+
</template>
31+
</test-fixture>
32+
33+
<script>
34+
suite('basic', function() {
35+
var button;
36+
var ink;
37+
38+
setup(function() {
39+
button = fixture('basic');
40+
ink = button.querySelector('paper-ripple');
41+
MockInteractions.blur(button);
5742
});
58-
</script>
5943

60-
</body>
44+
test('normal (no states)', function() {
45+
assert.isFalse(button.focused);
46+
assert.isFalse(ink._animating);
47+
assert.equal(ink.ripples.length, 0);
48+
});
49+
50+
test('receives focus', function() {
51+
MockInteractions.focus(button);
52+
53+
assert.isTrue(button.focused);
54+
assert.isTrue(ink._animating);
55+
assert.equal(ink.ripples.length, 1);
56+
});
57+
});
58+
</script>
59+
60+
</body>
6161
</html>

0 commit comments

Comments
 (0)