提交 ed6a96b5 编写于 作者: S Sandeep Somavarapu

Fix - submit in pattern inputs should trigger search

上级 4e2e9302
...@@ -11,6 +11,9 @@ import {IExpression, splitGlobAware} from 'vs/base/common/glob'; ...@@ -11,6 +11,9 @@ import {IExpression, splitGlobAware} from 'vs/base/common/glob';
import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox'; import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview'; import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
import { MessageType, InputBox, IInputValidator } from 'vs/base/browser/ui/inputbox/inputBox'; import { MessageType, InputBox, IInputValidator } from 'vs/base/browser/ui/inputbox/inputBox';
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
import CommonEvent, { Emitter } from 'vs/base/common/event';
export interface IOptions { export interface IOptions {
placeholder?: string; placeholder?: string;
...@@ -30,11 +33,14 @@ export class PatternInputWidget extends Widget { ...@@ -30,11 +33,14 @@ export class PatternInputWidget extends Widget {
private toDispose: any[]; private toDispose: any[];
private pattern: Checkbox; private pattern: Checkbox;
private domNode: HTMLElement; private domNode: HTMLElement;
private inputNode: HTMLInputElement; private inputNode: HTMLInputElement;
private inputBox: InputBox; private inputBox: InputBox;
private _onSubmit = this._register(new Emitter<boolean>());
public onSubmit: CommonEvent<boolean> = this._onSubmit.event;
constructor(parent: HTMLElement, private contextViewProvider: IContextViewProvider, options: IOptions = Object.create(null)) { constructor(parent: HTMLElement, private contextViewProvider: IContextViewProvider, options: IOptions = Object.create(null)) {
super(); super();
this.onOptionChange = null; this.onOptionChange = null;
...@@ -154,6 +160,8 @@ export class PatternInputWidget extends Widget { ...@@ -154,6 +160,8 @@ export class PatternInputWidget extends Widget {
} }
}); });
this.onkeyup(this.inputBox.inputElement, (keyboardEvent) => this.onInputKeyUp(keyboardEvent));
this.pattern = new Checkbox({ this.pattern = new Checkbox({
actionClassName: 'pattern', actionClassName: 'pattern',
title: nls.localize('patternDescription', "Use Glob Patterns"), title: nls.localize('patternDescription', "Use Glob Patterns"),
...@@ -201,4 +209,14 @@ export class PatternInputWidget extends Widget { ...@@ -201,4 +209,14 @@ export class PatternInputWidget extends Widget {
) )
}, true); }, true);
} }
private onInputKeyUp(keyboardEvent: IKeyboardEvent) {
switch (keyboardEvent.keyCode) {
case KeyCode.Enter:
this._onSubmit.fire();
return;
default:
return;
}
}
} }
\ No newline at end of file
...@@ -191,6 +191,8 @@ export class SearchViewlet extends Viewlet { ...@@ -191,6 +191,8 @@ export class SearchViewlet extends Viewlet {
}).on(FindInput.OPTION_CHANGE, (e) => { }).on(FindInput.OPTION_CHANGE, (e) => {
this.onQueryChanged(false); this.onQueryChanged(false);
}); });
this.inputPatternIncludes.onSubmit(() => this.onQueryChanged(true));
}); });
//pattern exclusion list //pattern exclusion list
...@@ -220,6 +222,8 @@ export class SearchViewlet extends Viewlet { ...@@ -220,6 +222,8 @@ export class SearchViewlet extends Viewlet {
}).on(FindInput.OPTION_CHANGE, (e) => { }).on(FindInput.OPTION_CHANGE, (e) => {
this.onQueryChanged(false); this.onQueryChanged(false);
}); });
this.inputPatternExclusions.onSubmit(() => this.onQueryChanged(true));
}); });
// add hint if we have global exclusion // add hint if we have global exclusion
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册