From 9dfc076ea40b6930f3c88166201c731ac3d8909c Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Tue, 13 Jun 2017 13:25:26 +0200 Subject: [PATCH] Fix: DropdownView should open upon arrow down key press. Closes #249. --- src/dropdown/dropdownview.js | 30 +----------------------------- tests/dropdown/dropdownview.js | 4 ++-- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/src/dropdown/dropdownview.js b/src/dropdown/dropdownview.js index 40b6c6d0..0e441b2b 100644 --- a/src/dropdown/dropdownview.js +++ b/src/dropdown/dropdownview.js @@ -98,34 +98,6 @@ export default class DropdownView extends View { // Toggle the visibility of the panel when the dropdown becomes open. panelView.bind( 'isVisible' ).to( this, 'isOpen' ); - - /** - * The label of the dropdown. - * - * @observable - * @member {String} #label - */ - - /** - * Controls whether the dropdown is enabled (can be clicked). - * - * @observable - * @member {Boolean} #isEnabled - */ - - /** - * Controls whether the {@link #buttonView} is "pushed". - * - * @observable - * @member {Boolean} #isOn - */ - - /** - * (Optional) Whether the label of the dropdown is visible. See {@link module:ui/button/buttonview~ButtonView#withText}. - * - * @observable - * @member {Boolean} #withText - */ } /** @@ -149,7 +121,7 @@ export default class DropdownView extends View { // Open the dropdown panel using the arrow down key, just like with return or space. this.keystrokes.set( 'arrowdown', ( data, cancel ) => { // Don't open if the dropdown is disabled or already open. - if ( this.isEnabled && !this.isOpen ) { + if ( this.buttonView.isEnabled && !this.isOpen ) { this.isOpen = true; cancel(); } diff --git a/tests/dropdown/dropdownview.js b/tests/dropdown/dropdownview.js index 87fd0e7d..0c3dd692 100644 --- a/tests/dropdown/dropdownview.js +++ b/tests/dropdown/dropdownview.js @@ -127,7 +127,7 @@ describe( 'DropdownView', () => { stopPropagation: sinon.spy() }; - view.isEnabled = true; + view.buttonView.isEnabled = true; view.isOpen = true; view.keystrokes.press( keyEvtData ); @@ -149,7 +149,7 @@ describe( 'DropdownView', () => { stopPropagation: sinon.spy() }; - view.isEnabled = false; + view.buttonView.isEnabled = false; view.isOpen = false; view.keystrokes.press( keyEvtData );