commit | 21334887255bea3cb5d53d0d8cb4b704e17ca260 | [log] [tgz] |
---|---|---|
author | Zentaro Kavanagh <zentaro@chromium.org> | Fri Jun 14 22:29:47 2019 |
committer | Zentaro Kavanagh <zentaro@chromium.org> | Fri Jun 14 22:29:47 2019 |
tree | 4e17456b3c4aace9e37cfb3dba26401381919067 | |
parent | 9b8cccfa8e389d8ea7bebd47c66a918c638c3fff [diff] |
WebUI: cr-slider change event should send value - cr-slider has never sent the value to cr-slider-value-changed - When cr-slider replaced paper-slider [1] as the backing for settings-slider it caused an empty event details to be sent - Display zoom tries to read the value in onDisplaySizeSliderDrag_ (display.js) [2] and gets undefined. - This caused calculations with the zoom value to use undefined which resulted in displaying NaN - Added test to cr-slider [1] - https://chromium-review.googlesource.com/c/chromium/src/+/1362245/17/ui/webui/resources/cr_elements/cr_slider/cr_slider.js [2] - https://cs.chromium.org/chromium/src/chrome/browser/resources/settings/device_page/display.js?q=onDisplaySizeSliderD&sq=package:chromium&g=0&l=729 BUG=chromium:932007 TEST=browser_tests --gtest-filter="CrElementsSliderTest.*" (cherry picked from commit 3f38f7f9d25d8ae5b161bf99711a5a20e5daa450) Change-Id: Iac2fb4d63d0df09d95bdcfffd72c329afd30297b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1652554 Reviewed-by: Esmael El-Moslimany <aee@chromium.org> Reviewed-by: May Lippert <maybelle@chromium.org> Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org> Auto-Submit: Zentaro Kavanagh <zentaro@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#668495} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1661032 Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org> Cr-Commit-Position: refs/branch-heads/3809@{#324} Cr-Branched-From: d82dec1a818f378c464ba307ddd9c92133eac355-refs/heads/master@{#665002}
diff --git a/chrome/browser/resources/settings/device_page/display.js b/chrome/browser/resources/settings/device_page/display.js index e15ae9e..371dd50 100644 --- a/chrome/browser/resources/settings/device_page/display.js +++ b/chrome/browser/resources/settings/device_page/display.js
@@ -719,14 +719,17 @@ /** * Handles the event where the display size slider is being dragged, i.e. the * mouse or tap has not been released. - * @param {!Event} e * @private */ - onDisplaySizeSliderDrag_: function(e) { + onDisplaySizeSliderDrag_: function() { if (!this.selectedDisplay) { return; } - this.updateLogicalResolutionText_(/** @type {number} */ (e.detail.value)); + + const sliderValue = this.$.displaySizeSlider.$$('#slider').value; + const zoomFactor = this.$.displaySizeSlider.ticks[sliderValue].value; + this.updateLogicalResolutionText_( + /** @type {number} */ (zoomFactor)); }, /**