inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #914 from Alfresco/dev-valbano-897

Browse Source 
Dev valbano 897
This commit is contained in:
Maurizio Vitale 2016-10-21 11:54:39 +01:00 committed by GitHub
commit 728ac0a669
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.html
View File

@ -1,11 +1,10 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label typeahead-widget"
[class.is-dirty]="value"
[class.typeahead-widget__invalid]="!field.isValid">
[class.typeahead-widget__invalid]="!field.isValid" id="typehead-div">
<input class="mdl-textfield__input"
type="text"
[attr.id]="field.id"
[(ngModel)]="value"
(ngModelChange)="checkVisibility(field)"
(keyup)="onKeyUp($event)"
(blur)="onBlur()"
[disabled]="field.readOnly">

39
ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts
View File

@ -210,7 +210,7 @@ describe('TypeaheadWidget', () => {
it('should get filtered options', () => {
let options: FormFieldOption[] = [
{ id: '1', name: 'Item one' },
{ id: '2', name: 'Item two'}
{ id: '2', name: 'Item two' }
];
widget.field.options = options;
widget.value = 'tw';
@ -275,8 +275,8 @@ describe('TypeaheadWidget', () => {
it('should reset fields when flushing missing option value', () => {
widget.field.options = [
{id: '1', name: 'Item one'},
{id: '2', name: 'Item two'}
{ id: '1', name: 'Item one' },
{ id: '2', name: 'Item two' }
];
widget.value = 'Missing item';
widget.flushValue();
@ -287,8 +287,8 @@ describe('TypeaheadWidget', () => {
it('should reset fields when flushing incorrect value', () => {
widget.field.options = [
{id: '1', name: 'Item one'},
{id: '2', name: 'Item two'}
{ id: '1', name: 'Item one' },
{ id: '2', name: 'Item two' }
];
widget.field.value = 'Item two';
widget.value = 'Item two!';
@ -308,4 +308,33 @@ describe('TypeaheadWidget', () => {
expect(widget.field.value).toBeNull();
});
it('should emit field change event on item click', () => {
let event = jasmine.createSpyObj('event', ['preventDefault']);
let fakeField = new FormFieldModel(new FormModel(), {id: 'fakeField', value: 'fakeValue'});
widget.field = fakeField;
let item = {id: 'fake-id-opt', name: 'fake-name-opt'};
widget.onItemClick(item, event);
widget.fieldChanged.subscribe((field) => {
expect(field).toBeDefined();
expect(field.id).toEqual('fakeField');
expect(field.value).toEqual('fake-id-opt');
});
});
it('should emit field change event on blur', (done) => {
spyOn(widget, 'flushValue').and.stub();
let fakeField = new FormFieldModel(new FormModel(), {id: 'fakeField', value: 'fakeValue'});
widget.field = fakeField;
widget.onBlur();
setTimeout(() => {
widget.fieldChanged.subscribe((field) => {
expect(field).toBeDefined();
expect(field.id).toEqual('field-id');
expect(field.value).toEqual('field-value');
});
done();
}, 200);
});
});

2
ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.ts
View File

@ -81,6 +81,7 @@ export class TypeaheadWidget extends WidgetComponent implements OnInit {
onBlur() {
setTimeout(() => {
this.flushValue();
this.checkVisibility(this.field);
}, 200);
}
@ -108,6 +109,7 @@ export class TypeaheadWidget extends WidgetComponent implements OnInit {
if (item) {
this.field.value = item.id;
this.value = item.name;
this.checkVisibility(this.field);
}
if (event) {
event.preventDefault();