summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapacible <apacible@chromium.org>2016-03-25 16:07:09 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 23:09:29 +0000
commitb6d78f039a327f70412ccdb2c03a341c7f1fc8af (patch)
treec59eb5daa9a4cb6ac457175c109665ff94cdeddb
parentc81425e082608177faabe49198193c0a4252ada9 (diff)
downloadchromium_src-b6d78f039a327f70412ccdb2c03a341c7f1fc8af.zip
chromium_src-b6d78f039a327f70412ccdb2c03a341c7f1fc8af.tar.gz
chromium_src-b6d78f039a327f70412ccdb2c03a341c7f1fc8af.tar.bz2
[Media Router WebUI] Switch on-click to on-tap for consistent event listening.
Previously, we used on-click for user click events, which made touch screen interactions inconsistent. This change switches all on-click listeners to on-tap, which listens for a event that fires consistently on touch/click platforms. Tested with the --simulate-touch-screen-with-mouse and enabling touch events in Chrome DevTools. BUG=596844 Review URL: https://codereview.chromium.org/1839433002 Cr-Commit-Position: refs/heads/master@{#383395}
-rw-r--r--chrome/browser/resources/media_router/elements/issue_banner/issue_banner.html4
-rw-r--r--chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html14
-rw-r--r--chrome/browser/resources/media_router/elements/media_router_header/media_router_header.html6
-rw-r--r--chrome/browser/resources/media_router/elements/route_details/route_details.html4
4 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/resources/media_router/elements/issue_banner/issue_banner.html b/chrome/browser/resources/media_router/elements/issue_banner/issue_banner.html
index d5f02ad..3a29dbb 100644
--- a/chrome/browser/resources/media_router/elements/issue_banner/issue_banner.html
+++ b/chrome/browser/resources/media_router/elements/issue_banner/issue_banner.html
@@ -15,12 +15,12 @@
</div>
<div id="buttons">
<paper-button flat id="opt-button" class="button"
- on-click="onClickOptAction_"
+ on-tap="onClickOptAction_"
hidden$="[[computeOptionalActionHidden_(issue)]]">
<span>[[secondaryActionButtonText_]]</span>
</paper-button>
<paper-button flat id="default-button"
- class="button action" on-click="onClickDefaultAction_">
+ class="button action" on-tap="onClickDefaultAction_">
<span>[[defaultActionButtonText_]]</span>
</paper-button>
</div>
diff --git a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html
index 3f0b684..bcf1650 100644
--- a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html
+++ b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html
@@ -47,7 +47,7 @@
</div>
<div id="first-run-button-container">
<paper-button id="first-run-button" class="button"
- on-click="acknowledgeFirstRunFlow_">
+ on-tap="acknowledgeFirstRunFlow_">
<span>[[firstRunFlowButtonText_]]</span>
</paper-button>
</div>
@@ -65,7 +65,7 @@
<paper-menu id="cast-mode-list">
<template is="dom-repeat" id="defaultCastModeList"
items="[[computeDefaultCastModeList_(castModeList)]]">
- <paper-item on-click="onCastModeClick_">
+ <paper-item on-tap="onCastModeClick_">
<iron-icon class="cast-mode-icon"
icon="[[computeCastModeIcon_(item)]]">
</iron-icon>
@@ -78,7 +78,7 @@
</div>
<template is="dom-repeat" id="nonDefaultCastModeList"
items="[[computeNonDefaultCastModeList_(castModeList)]]">
- <paper-item on-click="onCastModeClick_">
+ <paper-item on-tap="onCastModeClick_">
<iron-icon class="cast-mode-icon"
icon="[[computeCastModeIcon_(item)]]">
</iron-icon>
@@ -108,7 +108,7 @@
<paper-menu id="sink-list"
hidden$="[[computeSinkListHidden_(sinksToShow_, isUserSearching_)]]">
<template is="dom-repeat" id="sinkList" items="[[sinksToShow_]]">
- <paper-item on-click="onSinkClick_">
+ <paper-item on-tap="onSinkClick_">
<div class="sink-content">
<div>
<iron-icon icon="[[computeSinkIcon_(item)]]"
@@ -148,7 +148,7 @@
<div class="sink-content">
<div>
<paper-icon-button id="sink-search-icon" icon="search"
- on-click="searchButtonClick_">
+ on-tap="searchButtonClick_">
</paper-icon-button>
</div>
<div id="search-input-container">
@@ -167,7 +167,7 @@
hidden$="[[computeSearchResultsHidden_(isUserSearching_, searchResultsToShow_)]]">
<template is="dom-repeat" id="searchResults"
items="[[searchResultsToShow_]]">
- <paper-item class="search-item" on-click="onSinkClick_">
+ <paper-item class="search-item" on-tap="onSinkClick_">
<div class="sink-content">
<div>
<iron-icon icon="[[computeSinkIcon_(item.sinkItem)]]"
@@ -212,7 +212,7 @@
if="[[computeIssueBannerShown_(currentView_, issue)]]">
<issue-banner id="issue-banner" issue="[[issue]]"
class$="[[computeIssueBannerClass_(issue)]]"
- on-issue-action-click="showSinkList_">
+ on-issue-action-tap="showSinkList_">
</issue-banner>
</template>
</div>
diff --git a/chrome/browser/resources/media_router/elements/media_router_header/media_router_header.html b/chrome/browser/resources/media_router/elements/media_router_header/media_router_header.html
index 09c197c..11e5804 100644
--- a/chrome/browser/resources/media_router/elements/media_router_header/media_router_header.html
+++ b/chrome/browser/resources/media_router/elements/media_router_header/media_router_header.html
@@ -9,11 +9,11 @@
<paper-toolbar id="header-toolbar" class$="[[view]]">
<div id="back-button-container">
<paper-icon-button id="back-button" icon="[[arrowDropIcon_]]"
- on-click="onBackButtonClick_"
+ on-tap="onBackButtonClick_"
hidden$="[[computeBackButtonHidden_(view)]]">
</paper-icon-button>
</div>
- <div id="header-and-arrow-container" on-click="onHeaderOrArrowClick_">
+ <div id="header-and-arrow-container" on-tap="onHeaderOrArrowClick_">
<span id="header-text" title="[[tooltip]]">
[[headingText]]</span>
<div id="arrow-drop-container">
@@ -25,7 +25,7 @@
</div>
<div id="close-button-container">
<paper-icon-button icon="close" id="close-button"
- on-click="onCloseButtonClick_">
+ on-tap="onCloseButtonClick_">
</paper-icon-button>
</div>
<template is="dom-if" if="[[showEmail]]">
diff --git a/chrome/browser/resources/media_router/elements/route_details/route_details.html b/chrome/browser/resources/media_router/elements/route_details/route_details.html
index e7875e6..2e2895d 100644
--- a/chrome/browser/resources/media_router/elements/route_details/route_details.html
+++ b/chrome/browser/resources/media_router/elements/route_details/route_details.html
@@ -14,12 +14,12 @@
<paper-button flat class="route-button button"
id="start-casting-to-route-button"
hidden$="[[!route.canJoin]]"
- on-click="startCastingToRoute_">
+ on-tap="startCastingToRoute_">
<span>[[startCastingButtonText_]]</span>
</paper-button>
<paper-button flat class="route-button button"
id="close-route-button"
- on-click="closeRoute_">
+ on-tap="closeRoute_">
<span>[[stopCastingButtonText_]]</span>
</paper-button>
<div>