Skip to content

Commit

Permalink
Merge pull request #276 from hjalmers/4.x
Browse files Browse the repository at this point in the history
4.x
  • Loading branch information
hjalmers authored Sep 7, 2018
2 parents fe68d67 + f9f9a70 commit 4b2fe13
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 627 deletions.
2 changes: 1 addition & 1 deletion @angular-generic-table/column-settings/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@angular-generic-table/column-settings",
"version": "4.16.0",
"version": "4.17.1",
"description": "angular-generic-table extension that makes it easy to toggle column visibility and reoder columns.",
"main": "index.js",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
[ngIf]="!column.columnComponent && (((gtFields | gtProperty:column.objectKey:'inlineEdit')?.active | gtIsObservable) && ((gtFields | gtProperty:column.objectKey:'inlineEdit')?.active | async) || ((gtFields | gtProperty:column.objectKey:'inlineEdit')?.active | gtIsEditable:row:refreshPipe))">
<ng-template [ngIf]="([true,'email','number','password', 'text'].indexOf((gtFields | gtProperty:column.objectKey:'inlineEdit').type) !== -1) || !(gtFields | gtProperty:column.objectKey:'inlineEdit').type">
<input class="inline-edit" [attr.type]="!(gtFields | gtProperty:column.objectKey:'inlineEdit').type ? 'text' : !((gtFields | gtProperty:column.objectKey:'inlineEdit').type | gtIsObservable) ? (gtFields | gtProperty:column.objectKey:'inlineEdit').type:(gtFields | gtProperty:column.objectKey:'inlineEdit').type | async" [(ngModel)]="column.renderValue"
(keyup)="gtUpdateColumn($event,row, column)">
(input)="gtUpdateColumn($event,row, column)">
<span class="gt-inline-edit-notice">{{gtTexts.inlineEditEdited}}</span>
</ng-template>
<gt-dropdown
Expand All @@ -74,7 +74,7 @@
<ng-template
[ngIf]="[true,'email','number','password'].indexOf(gtFields | gtProperty:column.objectKey:'inlineEdit') !== -1">
<input class="inline-edit" [attr.type]="(gtFields | gtProperty:column.objectKey:'inlineEdit') === true ? 'text':(gtFields | gtProperty:column.objectKey:'inlineEdit')" [(ngModel)]="column.renderValue"
(keyup)="gtUpdateColumn($event,row, column)">
(input)="gtUpdateColumn($event,row, column)">
<span class="gt-inline-edit-notice">{{gtTexts.inlineEditEdited}}</span>
</ng-template>
<gt-dropdown
Expand Down
Loading

0 comments on commit 4b2fe13

Please sign in to comment.