Commit a37b38ca authored by dpapad's avatar dpapad Committed by Commit Bot

WebUI Polymer 2 migration: Convert <button is=cr-link-row> to a <button> wrapper.

Polymer2 does not support HTML element extensions, so all such elements need to
be converted to wrappers.

Bug: 818279
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I1cb05f71bff45f04e5ca5f5e64489813d8db7136
Reviewed-on: https://chromium-review.googlesource.com/972332Reviewed-by: default avatarScott Chen <scottchen@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544912}
parent ebae2ce0
...@@ -159,10 +159,6 @@ ...@@ -159,10 +159,6 @@
margin: 0; margin: 0;
} }
button[is='cr-link-row'] {
width: 100%;
}
#options-section .control-line:first-child { #options-section .control-line:first-child {
border-top: var(--cr-separator-line); border-top: var(--cr-separator-line);
} }
...@@ -380,20 +376,20 @@ ...@@ -380,20 +376,20 @@
</template> </template>
</div> </div>
</template> </template>
<button class="hr" is="cr-link-row" id="extensions-options" <cr-link-row class="hr" is="" id="extensions-options"
disabled="[[!isEnabled_(data.state)]]" disabled="[[!isEnabled_(data.state)]]"
hidden="[[!shouldShowOptionsLink_(data.*)]]" hidden="[[!shouldShowOptionsLink_(data.*)]]"
icon-class="icon-external" label="$i18n{itemOptions}" icon-class="icon-external" label="$i18n{itemOptions}"
on-click="onExtensionOptionsTap_"> on-click="onExtensionOptionsTap_">
</button> </cr-link-row>
<button class="hr" hidden="[[!data.manifestHomePageUrl.length]]" <cr-link-row class="hr" hidden="[[!data.manifestHomePageUrl.length]]"
is="cr-link-row" icon-class="icon-external" id="extensionWebsite" icon-class="icon-external" id="extensionWebsite"
label="$i18n{extensionWebsite}" on-click="onExtensionWebSiteTap_"> label="$i18n{extensionWebsite}" on-click="onExtensionWebSiteTap_">
</button> </cr-link-row>
<button class="hr" hidden="[[!data.webStoreUrl.length]]" <cr-link-row class="hr" hidden="[[!data.webStoreUrl.length]]"
is="cr-link-row" icon-class="icon-external" id="viewInStore" icon-class="icon-external" id="viewInStore"
label="$i18n{viewInStore}" on-click="onViewInStoreTap_"> label="$i18n{viewInStore}" on-click="onViewInStoreTap_">
</button> </cr-link-row>
<div class="section block"> <div class="section block">
<div class="section-title">$i18n{itemSource}</div> <div class="section-title">$i18n{itemSource}</div>
<div id="source" class="section-content"> <div id="source" class="section-content">
...@@ -407,11 +403,11 @@ ...@@ -407,11 +403,11 @@
</a> </a>
</div> </div>
</div> </div>
<button class="hr" is="cr-link-row" <cr-link-row class="hr"
hidden="[[isControlled_(data.controlledInfo)]]" hidden="[[isControlled_(data.controlledInfo)]]"
icon-class="subpage-arrow" id="remove-extension" icon-class="subpage-arrow" id="remove-extension"
label="$i18n{itemRemoveExtension}" on-click="onRemoveTap_"> label="$i18n{itemRemoveExtension}" on-click="onRemoveTap_">
</button> </cr-link-row>
</div> </div>
</div> </div>
</template> </template>
......
...@@ -56,8 +56,7 @@ ...@@ -56,8 +56,7 @@
focus-config="[[focusConfig_]]"> focus-config="[[focusConfig_]]">
<neon-animatable route-path="default"> <neon-animatable route-path="default">
<if expr="chromeos"> <if expr="chromeos">
<button icon-class="icon-external" id="wallpaperButton" <cr-link-row icon-class="icon-external" id="wallpaperButton"
is="cr-link-row"
hidden="[[!pageVisibility.setWallpaper]]" hidden="[[!pageVisibility.setWallpaper]]"
on-click="openWallpaperManager_" on-click="openWallpaperManager_"
label="$i18n{setWallpaper}" sub-label="$i18n{openWallpaperApp}" label="$i18n{setWallpaper}" sub-label="$i18n{openWallpaperApp}"
...@@ -67,15 +66,15 @@ ...@@ -67,15 +66,15 @@
indicator-type="devicePolicy"> indicator-type="devicePolicy">
</cr-policy-indicator> </cr-policy-indicator>
</template> </template>
</button> </cr-link-row>
<div class="hr"></div> <div class="hr"></div>
</if> </if>
<div class="settings-row continuation" id="themeRow" <div class="settings-row continuation" id="themeRow"
hidden="[[!pageVisibility.setTheme]]"> hidden="[[!pageVisibility.setTheme]]">
<button class="first" icon-class="icon-external" is="cr-link-row" <cr-link-row class="first" icon-class="icon-external"
hidden="[[!pageVisibility.setTheme]]" hidden="[[!pageVisibility.setTheme]]"
label="$i18n{themes}" sub-label="[[themeSublabel_]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]"
on-click="openThemeUrl_"></button> on-click="openThemeUrl_"></cr-link-row>
<if expr="not is_linux or chromeos"> <if expr="not is_linux or chromeos">
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
<div class="separator"></div> <div class="separator"></div>
...@@ -165,10 +164,10 @@ ...@@ -165,10 +164,10 @@
menu-options="[[fontSizeOptions_]]"> menu-options="[[fontSizeOptions_]]">
</settings-dropdown-menu> </settings-dropdown-menu>
</div> </div>
<button class="hr" is="cr-link-row" <cr-link-row class="hr"
icon-class="subpage-arrow" id="customize-fonts-subpage-trigger" icon-class="subpage-arrow" id="customize-fonts-subpage-trigger"
label="$i18n{customizeFonts}" on-click="onCustomizeFontsTap_"> label="$i18n{customizeFonts}" on-click="onCustomizeFontsTap_">
</button> </cr-link-row>
<div class="settings-box" hidden="[[!pageVisibility.pageZoom]]"> <div class="settings-box" hidden="[[!pageVisibility.pageZoom]]">
<div id="pageZoom" class="start">$i18n{pageZoom}</div> <div id="pageZoom" class="start">$i18n{pageZoom}</div>
<div class="md-select-wrapper"> <div class="md-select-wrapper">
......
...@@ -209,11 +209,11 @@ ...@@ -209,11 +209,11 @@
</div> </div>
</template> </template>
<button is="cr-link-row" icon-class="subpage-arrow" class="indented hr" <cr-link-row icon-class="subpage-arrow" class="indented hr"
id="overscan" label="$i18n{displayOverscanPageTitle}" id="overscan" label="$i18n{displayOverscanPageTitle}"
sub-label="$i18n{displayOverscanPageText}" on-click="onOverscanTap_" sub-label="$i18n{displayOverscanPageText}" on-click="onOverscanTap_"
hidden$="[[!showOverscanSetting_(selectedDisplay)]]"> hidden$="[[!showOverscanSetting_(selectedDisplay)]]">
</button> </cr-link-row>
<settings-display-overscan-dialog id="displayOverscan" <settings-display-overscan-dialog id="displayOverscan"
display-id="{{overscanDisplayId}}" display-id="{{overscanDisplayId}}"
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
<settings-animated-pages id="pages" section="passwordsAndForms" <settings-animated-pages id="pages" section="passwordsAndForms"
focus-config="[[focusConfig_]]"> focus-config="[[focusConfig_]]">
<neon-animatable route-path="default"> <neon-animatable route-path="default">
<button is="cr-link-row" icon-class="subpage-arrow" <cr-link-row icon-class="subpage-arrow"
id="autofillManagerButton" label="$i18n{autofill}" id="autofillManagerButton" label="$i18n{autofill}"
sub-label="$i18n{autofillDetail}" on-click="onAutofillTap_"> sub-label="$i18n{autofillDetail}" on-click="onAutofillTap_">
</button> </cr-link-row>
<div class="settings-box two-line"> <div class="settings-box two-line">
<div class="start two-line" on-click="onPasswordsTap_" actionable <div class="start two-line" on-click="onPasswordsTap_" actionable
id="passwordManagerButton"> id="passwordManagerButton">
......
...@@ -12,12 +12,16 @@ ...@@ -12,12 +12,16 @@
:host { :host {
align-items: center; align-items: center;
align-self: stretch; align-self: stretch;
display: block;
flex: 1;
}
:host > button {
background: none; background: none;
border: none; border: none;
color: inherit; color: inherit;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
flex: 1;
font-family: inherit; font-family: inherit;
font-size: 100%; /* Specifically for Mac OSX, harmless elsewhere. */ font-size: 100%; /* Specifically for Mac OSX, harmless elsewhere. */
line-height: 154%; /* 20px. */ line-height: 154%; /* 20px. */
...@@ -25,6 +29,7 @@ ...@@ -25,6 +29,7 @@
min-height: var(--cr-section-min-height); min-height: var(--cr-section-min-height);
outline: none; outline: none;
padding: 0 var(--cr-section-padding); padding: 0 var(--cr-section-padding);
width: 100%;
} }
:host([disabled]) { :host([disabled]) {
...@@ -70,6 +75,7 @@ ...@@ -70,6 +75,7 @@
font-weight: 400; font-weight: 400;
} }
</style> </style>
<button disabled="[[disabled]]">
<div id="outer" noSubLabel$="[[!subLabel]]"> <div id="outer" noSubLabel$="[[!subLabel]]">
<div id="labelWrapper" hidden="[[!label]]"> <div id="labelWrapper" hidden="[[!label]]">
<div id="label" class="label">[[label]]</div> <div id="label" class="label">[[label]]</div>
...@@ -79,6 +85,7 @@ ...@@ -79,6 +85,7 @@
<div id="icon" class$="cr-icon [[iconClass]]" aria-hidden="true"> <div id="icon" class$="cr-icon [[iconClass]]" aria-hidden="true">
</div> </div>
</div> </div>
</button>
</template> </template>
<script src="cr_link_row.js"></script> <script src="cr_link_row.js"></script>
</dom-module> </dom-module>
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
*/ */
Polymer({ Polymer({
is: 'cr-link-row', is: 'cr-link-row',
extends: 'button',
behaviors: [Polymer.PaperRippleBehavior], behaviors: [Polymer.PaperRippleBehavior],
...@@ -26,6 +25,11 @@ Polymer({ ...@@ -26,6 +25,11 @@ Polymer({
/* Value used for noSubLabel attribute. */ /* Value used for noSubLabel attribute. */
value: '', value: '',
}, },
disabled: {
type: Boolean,
reflectToAttribute: true,
},
}, },
listeners: { listeners: {
......
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