development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

NPE in selectBox.ts (fixes #24584)

Browse source
This commit is contained in:
Benjamin Pasero 2017-04-12 13:48:45 +02:00
parent a00275b3c3
commit 581962b773
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/base/browser/ui/selectBox/selectBox.ts
View file

@ -11,6 +11,7 @@ import { Widget } from 'vs/base/browser/ui/widget';
import * as dom from 'vs/base/browser/dom';
import * as arrays from 'vs/base/common/arrays';
import { Color } from "vs/base/common/color";
import { clone } from "vs/base/common/objects";
export interface ISelectBoxStyles {
selectBackground?: Color;
@ -36,7 +37,7 @@ export class SelectBox extends Widget {
private selectForeground: Color;
private selectBorder: Color;
constructor(options: string[], selected: number, styles?: ISelectBoxStyles) {
constructor(options: string[], selected: number, styles: ISelectBoxStyles = clone(defaultStyles)) {
super();
this.selectElement = document.createElement('select');
@ -46,9 +47,9 @@ export class SelectBox extends Widget {
this.toDispose = [];
this._onDidSelect = new Emitter<string>();
this.selectBackground = styles.selectBackground || defaultStyles.selectBackground;
this.selectForeground = styles.selectForeground || defaultStyles.selectForeground;
this.selectBorder = styles.selectBorder || defaultStyles.selectBorder;
this.selectBackground = styles.selectBackground;
this.selectForeground = styles.selectForeground;
this.selectBorder = styles.selectBorder;
this.toDispose.push(dom.addStandardDisposableListener(this.selectElement, 'change', (e) => {
this.selectElement.title = e.target.value;