Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions

View File

@@ -41,11 +41,11 @@ export class DropdownList extends Dropdown {
if (action) {
this.button = new Button(_contentContainer);
this.button.label = action.label;
this.toDispose.push(DOM.addDisposableListener(this.button.element, DOM.EventType.CLICK, () => {
this._register(DOM.addDisposableListener(this.button.element, DOM.EventType.CLICK, () => {
action.run();
this.hide();
}));
this.toDispose.push(DOM.addDisposableListener(this.button.element, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
this._register(DOM.addDisposableListener(this.button.element, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
let event = new StandardKeyboardEvent(e);
if (event.equals(KeyCode.Enter)) {
e.stopPropagation();
@@ -75,7 +75,7 @@ export class DropdownList extends Dropdown {
}
}));
this.toDispose.push(this._list.onSelectionChange(() => {
this._register(this._list.onSelectionChange(() => {
// focus on the dropdown label then hide the dropdown list
this.element.focus();
this.hide();