Commit 4bc89a5b authored by dpapad's avatar dpapad Committed by Commit Bot

WebUI: Update Polymer paper-checkbox version 1.4.0 -> 2.0.2

Bug: 738611
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Iad8fde7df949176ce836671916de50db6fa7099e
Reviewed-on: https://chromium-review.googlesource.com/882465
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarHector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532123}
parent 3d6ada5e
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
"neon-animation": "PolymerElements/neon-animation#1.2.4", "neon-animation": "PolymerElements/neon-animation#1.2.4",
"paper-behaviors": "PolymerElements/paper-behaviors#1.0.12", "paper-behaviors": "PolymerElements/paper-behaviors#1.0.12",
"paper-button": "PolymerElements/paper-button#2.0.0", "paper-button": "PolymerElements/paper-button#2.0.0",
"paper-checkbox": "PolymerElements/paper-checkbox#1.4.0", "paper-checkbox": "PolymerElements/paper-checkbox#2.0.2",
"paper-fab": "PolymerElements/paper-fab#2.0.0", "paper-fab": "PolymerElements/paper-fab#2.0.0",
"paper-icon-button": "PolymerElements/paper-icon-button#1.1.6", "paper-icon-button": "PolymerElements/paper-icon-button#1.1.6",
"paper-input": "PolymerElements/paper-input#1.1.21", "paper-input": "PolymerElements/paper-input#1.1.21",
......
{ {
"name": "paper-checkbox", "name": "paper-checkbox",
"version": "1.4.0", "version": "2.0.2",
"description": "A material design checkbox", "description": "A material design checkbox",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
...@@ -19,22 +19,48 @@ ...@@ -19,22 +19,48 @@
}, },
"license": "http://polymer.github.io/LICENSE.txt", "license": "http://polymer.github.io/LICENSE.txt",
"homepage": "https://github.com/PolymerElements/paper-checkbox", "homepage": "https://github.com/PolymerElements/paper-checkbox",
"main": "paper-checkbox.html",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {
"polymer": "Polymer/polymer#^1.6.0", "polymer": "Polymer/polymer#1.9 - 2",
"iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#^1.0.0", "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#1 - 2",
"paper-behaviors": "PolymerElements/paper-behaviors#^1.0.0", "paper-behaviors": "PolymerElements/paper-behaviors#1 - 2",
"paper-ripple": "PolymerElements/paper-ripple#^1.0.0", "paper-ripple": "PolymerElements/paper-ripple#1 - 2",
"paper-styles": "PolymerElements/paper-styles#^1.1.0" "paper-styles": "PolymerElements/paper-styles#1 - 2",
"iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#1 - 2"
}, },
"devDependencies": { "devDependencies": {
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0",
"web-component-tester": "^4.0.0", "web-component-tester": "^6.0.0",
"test-fixture": "PolymerElements/test-fixture#^1.0.0", "iron-component-page": "PolymerElements/iron-component-page#1 - 2",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0", "iron-demo-helpers": "PolymerElements/iron-demo-helpers#1 - 2",
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0", "iron-flex-layout": "PolymerElements/iron-flex-layout#1 - 2",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0", "iron-test-helpers": "PolymerElements/iron-test-helpers#1 - 2"
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"main": "paper-checkbox.html" "variants": {
"1.x": {
"dependencies": {
"polymer": "Polymer/polymer#^1.9",
"iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#^1.0.0",
"paper-behaviors": "PolymerElements/paper-behaviors#^1.0.0",
"paper-ripple": "PolymerElements/paper-ripple#^1.0.0",
"paper-styles": "PolymerElements/paper-styles#^1.1.0",
"iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#^1.0.0"
},
"devDependencies": {
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"web-component-tester": "^4.0.0",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0",
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
},
"resolutions": {
"webcomponentsjs": "^0.7"
}
}
},
"resolutions": {
"webcomponentsjs": "^1.0.0"
}
} }
...@@ -30,21 +30,33 @@ Polymer({ ...@@ -30,21 +30,33 @@ Polymer({
}, },
attached: function() { attached: function() {
var inkSize = this.getComputedStyleValue('--calculated-paper-checkbox-ink-size'); // Wait until styles have resolved to check for the default sentinel.
// If unset, compute and set the default `--paper-checkbox-ink-size`. // See polymer#4009 for more details.
if (inkSize === '-1px') { Polymer.RenderStatus.afterNextRender(this, function() {
var checkboxSize = parseFloat(this.getComputedStyleValue('--calculated-paper-checkbox-size')); var inkSize = this.getComputedStyleValue('--calculated-paper-checkbox-ink-size').trim();
var defaultInkSize = Math.floor((8 / 3) * checkboxSize); // If unset, compute and set the default `--paper-checkbox-ink-size`.
if (inkSize === '-1px') {
var checkboxSizeText = this.getComputedStyleValue('--calculated-paper-checkbox-size').trim();
// The checkbox and ripple need to have the same parity so that their var units = checkboxSizeText.match(/[A-Za-z]+$/)[0] || 'px';
// centers align. var checkboxSize = parseFloat(checkboxSizeText);
if (defaultInkSize % 2 !== checkboxSize % 2) { var defaultInkSize = (8 / 3) * checkboxSize;
defaultInkSize++;
}
this.customStyle['--paper-checkbox-ink-size'] = defaultInkSize + 'px'; if (units === 'px') {
this.updateStyles(); defaultInkSize = Math.floor(defaultInkSize);
}
// The checkbox and ripple need to have the same parity so that their
// centers align.
if (defaultInkSize % 2 !== checkboxSize % 2) {
defaultInkSize++;
}
}
this.updateStyles({
'--paper-checkbox-ink-size': defaultInkSize + units,
});
}
});
}, },
_computeCheckboxClass: function(checked, invalid) { _computeCheckboxClass: function(checked, invalid) {
......
...@@ -64,7 +64,7 @@ In order to apply the `Roboto` font to this element, make sure you've imported ` ...@@ -64,7 +64,7 @@ In order to apply the `Roboto` font to this element, make sure you've imported `
--calculated-paper-checkbox-size: var(--paper-checkbox-size, 18px); --calculated-paper-checkbox-size: var(--paper-checkbox-size, 18px);
/* -1px is a sentinel for the default and is replaced in `attached`. */ /* -1px is a sentinel for the default and is replaced in `attached`. */
--calculated-paper-checkbox-ink-size: var(--paper-checkbox-ink-size, -1px); --calculated-paper-checkbox-ink-size: var(--paper-checkbox-ink-size, -1px);
@apply(--paper-font-common-base); @apply --paper-font-common-base;
line-height: 0; line-height: 0;
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent;
} }
...@@ -179,12 +179,12 @@ In order to apply the `Roboto` font to this element, make sure you've imported ` ...@@ -179,12 +179,12 @@ In order to apply the `Roboto` font to this element, make sure you've imported `
white-space: normal; white-space: normal;
line-height: normal; line-height: normal;
color: var(--paper-checkbox-label-color, var(--primary-text-color)); color: var(--paper-checkbox-label-color, var(--primary-text-color));
@apply(--paper-checkbox-label); @apply --paper-checkbox-label;
} }
:host([checked]) #checkboxLabel { :host([checked]) #checkboxLabel {
color: var(--paper-checkbox-label-checked-color, var(--paper-checkbox-label-color, var(--primary-text-color))); color: var(--paper-checkbox-label-checked-color, var(--paper-checkbox-label-color, var(--primary-text-color)));
@apply(--paper-checkbox-label-checked); @apply --paper-checkbox-label-checked;
} }
:host-context([dir="rtl"]) #checkboxLabel { :host-context([dir="rtl"]) #checkboxLabel {
...@@ -224,7 +224,7 @@ In order to apply the `Roboto` font to this element, make sure you've imported ` ...@@ -224,7 +224,7 @@ In order to apply the `Roboto` font to this element, make sure you've imported `
</div> </div>
</div> </div>
<div id="checkboxLabel"><content></content></div> <div id="checkboxLabel"><slot></slot></div>
</template> </template>
</dom-module> </dom-module>
......
...@@ -198,9 +198,9 @@ Tree link: https://github.com/PolymerElements/paper-button/tree/v2.0.0 ...@@ -198,9 +198,9 @@ Tree link: https://github.com/PolymerElements/paper-button/tree/v2.0.0
Name: paper-checkbox Name: paper-checkbox
Repository: https://github.com/PolymerElements/paper-checkbox.git Repository: https://github.com/PolymerElements/paper-checkbox.git
Tree: v1.4.0 Tree: v2.0.2
Revision: 1d1c9439fe3a056356233e04171fd9c62f0857fb Revision: 8404761baae76f5229dd31f0ffe22ae400a67ee2
Tree link: https://github.com/PolymerElements/paper-checkbox/tree/v1.4.0 Tree link: https://github.com/PolymerElements/paper-checkbox/tree/v2.0.2
Name: paper-fab Name: paper-fab
Repository: https://github.com/PolymerElements/paper-fab.git Repository: https://github.com/PolymerElements/paper-fab.git
......
...@@ -6,6 +6,7 @@ compiled_resources*.gyp ...@@ -6,6 +6,7 @@ compiled_resources*.gyp
demo*.html demo*.html
*/demos/ */demos/
docs.html docs.html
.eslintrc.json
.github .github
.gitignore .gitignore
hero.svg hero.svg
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment