Skip to content

Commit

Permalink
Merge branch 'master' into rkolev/fix-3523-master
Browse files Browse the repository at this point in the history
  • Loading branch information
rkaraivanov authored Jan 14, 2019
2 parents 48cbb9f + 5f18319 commit 22597ae
Show file tree
Hide file tree
Showing 31 changed files with 1,491 additions and 1,480 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Ignite UI for Angular Change Log

All notable changes for each version of this project will be documented in this file.
## 7.2.0
- `igxCombo`
- **Breaking Change** `combo.value` is now only a getter.
## 7.1.2
### Features
- `igx-circular-bar` and `igx-linear-bar` now feature an indeterminate input property. When this property is set to true the indicator will be continually growing and shrinking along the track.
Expand Down
9 changes: 7 additions & 2 deletions projects/igniteui-angular/src/lib/combo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The service, should inform the combo for the total items that are on the server

### Value Binding

If we want to use a two-way data-binding, we could just use `ngModule` like this:
If we want to use a two-way data-binding, we could just use `ngModel` like this:

```html
<igx-combo #combo [(ngModel)]="values"></igx-combo>
Expand Down Expand Up @@ -210,7 +210,6 @@ When igxCombo is opened, allow custom values are enabled and add item button is
|--------------------------|---------------------------------------------------|-----------------------------|
| `id` | combo id | string |
| `data` | combo data source | any |
| `value` | combo value | string |
| `allowCustomValue` | enables/disables combo custom value | boolean |
| `filterable` | enables/disables combo drop down filtering - enabled by default | boolean |
| `valueKey` | combo value data source property | string |
Expand All @@ -231,6 +230,11 @@ When igxCombo is opened, allow custom values are enabled and add item button is
| `type` | Combo style. - "line", "box", "border", "search" | string |
| `valid` | gets if control is valid, when used in a form | boolean |

### Getters
| Name | Description | Type |
|--------------------------|---------------------------------------------------|-----------------------------|
| `value` | the value of the combo text field | string |

### Outputs

| Name | Description | Cancelable | Parameters |
Expand All @@ -256,3 +260,4 @@ When igxCombo is opened, allow custom values are enabled and add item button is
| `deselectItems` | Deselect defined items | `void` | items: `Array<any>` |
| `selectAllItems` | Select all (filtered) items | `void` | ignoreFilter?: `boolean` - if `true` selects **all** values |
| `deselectAllItems` | Deselect (filtered) all items | `void` | ignoreFilter?: `boolean` - if `true` deselects **all** values |
| `setSelectedItem` | Toggles (select/deselect) an item by key | `void` | itemID: any, select = true, event?: Event |
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { IgxComboItemComponent } from './combo-item.component';
import { Component } from '@angular/core';

@Component({
selector: 'igx-combo-add-item',
template: '<ng-content></ng-content>',
providers: [{ provide: IgxComboItemComponent, useExisting: IgxComboAddItemComponent}]
})
export class IgxComboAddItemComponent extends IgxComboItemComponent {
get isSelected(): boolean {
return false;
}
set isSelected(value: boolean) {
}

clicked(event?) {
this.comboAPI.disableTransitions = false;
this.comboAPI.add_custom_item();
}
}
Loading

0 comments on commit 22597ae

Please sign in to comment.