Commit 3e06bbdd authored by Esmael El-Moslimany's avatar Esmael El-Moslimany Committed by Commit Bot

Settings: fix event handling for Polymer 2

The feature that allowed specifying an element id before the event name
in the listeners object is no longer supported in Polymer 2.

For example:

  listeners: {
    'id.eventName': 'onEventName_',
  }

Bug: 885294
Change-Id: Ieb468d10ebdc3ba436fdc38b8858b6a1b237e93f
Reviewed-on: https://chromium-review.googlesource.com/1237400Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Esmael El-Moslimany <aee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593655}
parent bfb92937
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
opacity: var(--cr-container-shadow-max-opacity); opacity: var(--cr-container-shadow-max-opacity);
} }
#downloads-list { #downloadsList {
min-width: calc( min-width: calc(
var(--downloads-card-width) + 2 * var(--downloads-card-margin)); var(--downloads-card-width) + 2 * var(--downloads-card-margin));
/* TODO(dbeam): we're not setting scrollTarget explicitly, yet /* TODO(dbeam): we're not setting scrollTarget explicitly, yet
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
} }
#no-downloads, #no-downloads,
#downloads-list { #downloadsList {
flex: 1; flex: 1;
} }
:host([loading]) #no-downloads, :host([loading]) #no-downloads,
:host([loading]) #downloads-list { :host([loading]) #downloadsList {
display: none; display: none;
} }
...@@ -89,12 +89,12 @@ ...@@ -89,12 +89,12 @@
</style> </style>
<downloads-toolbar id="toolbar" spinner-active="{{spinnerActive_}}" <downloads-toolbar id="toolbar" spinner-active="{{spinnerActive_}}"
role="none"> role="none" on-search-changed="onSearchChanged_">
</downloads-toolbar> </downloads-toolbar>
<div id="drop-shadow"></div> <div id="drop-shadow"></div>
<div id="mainContainer"> <div id="mainContainer">
<iron-list id="downloads-list" items="[[items_]]" <iron-list id="downloadsList" items="[[items_]]"
hidden="[[!hasDownloads_]]"> hidden="[[!hasDownloads_]]" on-scroll="onListScroll_">
<template> <template>
<downloads-item data="[[item]]"></downloads-item> <downloads-item data="[[item]]"></downloads-item>
</template> </template>
......
...@@ -46,11 +46,6 @@ cr.define('downloads', function() { ...@@ -46,11 +46,6 @@ cr.define('downloads', function() {
loading: true, loading: true,
}, },
listeners: {
'downloads-list.scroll': 'onListScroll_',
'toolbar.search-changed': 'onSearchChanged_',
},
observers: [ observers: [
'itemsChanged_(items_.*)', 'itemsChanged_(items_.*)',
], ],
...@@ -86,7 +81,7 @@ cr.define('downloads', function() { ...@@ -86,7 +81,7 @@ cr.define('downloads', function() {
this.$.toolbar.downloadsShowing = this.hasDownloads_; this.$.toolbar.downloadsShowing = this.hasDownloads_;
if (this.hasDownloads_) if (this.hasDownloads_)
this.$['downloads-list'].fire('iron-resize'); this.$.downloadsList.fire('iron-resize');
}, },
/** /**
...@@ -172,7 +167,7 @@ cr.define('downloads', function() { ...@@ -172,7 +167,7 @@ cr.define('downloads', function() {
/** @private */ /** @private */
onListScroll_: function() { onListScroll_: function() {
const list = this.$['downloads-list']; const list = this.$.downloadsList;
if (list.scrollHeight - list.scrollTop - list.offsetHeight <= 100) { if (list.scrollHeight - list.scrollTop - list.offsetHeight <= 100) {
// Approaching the end of the scrollback. Attempt to load more items. // Approaching the end of the scrollback. Attempt to load more items.
this.searchService_.loadMore(); this.searchService_.loadMore();
...@@ -249,7 +244,7 @@ cr.define('downloads', function() { ...@@ -249,7 +244,7 @@ cr.define('downloads', function() {
removed: [], removed: [],
}]); }]);
this.async(() => { this.async(() => {
const list = /** @type {!IronListElement} */ (this.$['downloads-list']); const list = /** @type {!IronListElement} */ (this.$.downloadsList);
list.updateSizeForIndex(index); list.updateSizeForIndex(index);
}); });
}, },
......
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
exceeds the bounds, it will scroll by default. No space or comments exceeds the bounds, it will scroll by default. No space or comments
allowed before closing tag. --> allowed before closing tag. -->
<textarea id="input" autofocus="[[autofocus]]" rows="3" <textarea id="input" autofocus="[[autofocus]]" rows="3"
value="{{value::input}}" aria-label$="[[label]]"></textarea> value="{{value::input}}" aria-label$="[[label]]"
on-focus="onInputFocusChange_" on-blur="onInputFocusChange_"
on-change="onInputChange_"></textarea>
<div id="underline"></div> <div id="underline"></div>
</div> </div>
</template> </template>
......
...@@ -32,12 +32,6 @@ Polymer({ ...@@ -32,12 +32,6 @@ Polymer({
'aria-disabled': 'false', 'aria-disabled': 'false',
}, },
listeners: {
'input.focus': 'onInputFocusChange_',
'input.blur': 'onInputFocusChange_',
'input.change': 'onInputChange_',
},
/** /**
* 'change' event fires when <input> value changes and user presses 'Enter'. * 'change' event fires when <input> value changes and user presses 'Enter'.
* This function helps propagate it to host since change events don't * This function helps propagate it to host since change events don't
......
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
</settings-clear-browsing-data-dialog> </settings-clear-browsing-data-dialog>
</template> </template>
<template id="doNotTrackDialogIf" is="dom-if" <template id="doNotTrackDialogIf" is="dom-if"
if="[[showDoNotTrackDialog_]]" notify-dom-change> if="[[showDoNotTrackDialog_]]" notify-dom-change
on-dom-change="onDoNotTrackDomChange_">
<cr-dialog id="confirmDoNotTrackDialog" <cr-dialog id="confirmDoNotTrackDialog"
close-text="$i18n{close}" on-cancel="onDoNotTrackDialogCancel_" close-text="$i18n{close}" on-cancel="onDoNotTrackDialogCancel_"
on-close="onDoNotTrackDialogClosed_"> on-close="onDoNotTrackDialogClosed_">
......
...@@ -165,10 +165,6 @@ Polymer({ ...@@ -165,10 +165,6 @@ Polymer({
}, },
}, },
listeners: {
'doNotTrackDialogIf.dom-change': 'onDoNotTrackDomChange_',
},
/** @override */ /** @override */
ready: function() { ready: function() {
this.ContentSettingsTypes = settings.ContentSettingsTypes; this.ContentSettingsTypes = settings.ContentSettingsTypes;
......
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