maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix - submit in pattern inputs should trigger search

Browse source
This commit is contained in:
Sandeep Somavarapu 2016-06-24 11:14:25 +02:00
parent 4e2e9302d3
commit ed6a96b5cd
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/vs/workbench/parts/search/browser/patternInputWidget.ts
View file

@ -11,6 +11,9 @@ import {IExpression, splitGlobAware} from 'vs/base/common/glob';
import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
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 {
placeholder?: string;
@ -30,11 +33,14 @@ export class PatternInputWidget extends Widget {
private toDispose: any[];
private pattern: Checkbox;
private domNode: HTMLElement;
private inputNode: HTMLInputElement;
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)) {
super();
this.onOptionChange = null;
@ -154,6 +160,8 @@ export class PatternInputWidget extends Widget {
}
});
this.onkeyup(this.inputBox.inputElement, (keyboardEvent) => this.onInputKeyUp(keyboardEvent));
this.pattern = new Checkbox({
actionClassName: 'pattern',
title: nls.localize('patternDescription', "Use Glob Patterns"),
@ -201,4 +209,14 @@ export class PatternInputWidget extends Widget {
)
}, true);
}
private onInputKeyUp(keyboardEvent: IKeyboardEvent) {
switch (keyboardEvent.keyCode) {
case KeyCode.Enter:
this._onSubmit.fire();
return;
default:
return;
}
}
}

4
src/vs/workbench/parts/search/browser/searchViewlet.ts
View file

@ -191,6 +191,8 @@ export class SearchViewlet extends Viewlet {
}).on(FindInput.OPTION_CHANGE, (e) => {
this.onQueryChanged(false);
});
this.inputPatternIncludes.onSubmit(() => this.onQueryChanged(true));
});
//pattern exclusion list
@ -220,6 +222,8 @@ export class SearchViewlet extends Viewlet {
}).on(FindInput.OPTION_CHANGE, (e) => {
this.onQueryChanged(false);
});
this.inputPatternExclusions.onSubmit(() => this.onQueryChanged(true));
});
// add hint if we have global exclusion