-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'vNext' of https://github.com/IgniteUI/igniteui-angular-…
…samples into simeonoff/live-editing-libsass
- Loading branch information
Showing
61 changed files
with
269 additions
and
254 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../app/tree-grid/tree-grid-childdatakey-sample/tree-grid-childdatakey-sample.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/app/grid/grid-allData-summary/grid-allData-summary.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../grid/grid-conditional-row-selectors/grid-conditional-row-selectors-sample.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/app/grid/grid-custom-kb-navigation/grid-custom-kb-navigation-sample.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 25 additions & 29 deletions
54
src/app/grid/grid-custom-remote-paging-sample/custom-remote-paging-sample.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,34 @@ | ||
<div class="grid__wrapper"> | ||
<igx-grid igxPreventDocumentScroll #grid1 [data]="data | async" width="100%" height="580px" [perPage]="perPage"> | ||
<igx-paginator> | ||
<!-- Auto migrated template content. Please, check your bindings! --> | ||
|
||
<igx-paginator-content> | ||
|
||
<div class="igx-grid__footer"> | ||
<div id="numberPager" class="igx-paginator" style="justify-content: center;"> | ||
<button [disabled]="firstPage" (click)="previousPage()" igxButton="flat"> | ||
PREV | ||
</button> | ||
<span *ngIf="shouldShowFirstPage" (click)="paginate(0)"> | ||
<a class="pageNavLinks" [routerLink]>{{1}}</a> <span class="pageNavLinks">...</span> | ||
</span> | ||
<span *ngFor="let item of pages" (click)="paginate(item)"> | ||
<a class="pageNavLinks {{activePage(item)}}" [routerLink]>{{item + 1}}</a> | ||
</span> | ||
<span *ngIf="shouldShowLastPage" (click)="paginate(totalPages - 1)"> | ||
<span class="pageNavLinks">...</span> <a class="pageNavLinks" [routerLink]>{{ totalPages }}</a> | ||
</span> | ||
<button [disabled]="lastPage" (click)="nextPage()" igxButton="flat"> | ||
NEXT | ||
</button> | ||
</div> | ||
</div> | ||
|
||
</igx-paginator-content> | ||
</igx-paginator> | ||
<igx-grid igxPreventDocumentScroll #grid1 [data]="data | async" width="100%" height="580px"> | ||
<igx-column field="ID"></igx-column> | ||
<igx-column field="ProductName"></igx-column> | ||
<igx-column field="QuantityPerUnit"></igx-column> | ||
<igx-column field="SupplierName"></igx-column> | ||
<igx-column field="UnitsInStock"></igx-column> | ||
<igx-column field="Rating"></igx-column> | ||
<igx-paginator [perPage]="perPage"> | ||
<igx-paginator-content> | ||
<div class="fullWidth"> | ||
<div id="numberPager" class="fullWidth"> | ||
<button [disabled]="firstPage" (click)="previousPage()" igxButton="flat"> | ||
PREV | ||
</button> | ||
<span *ngIf="shouldShowFirstPage" (click)="paginate(0)"> | ||
<a class="pageNavLinks" [routerLink]>{{1}}</a> <span class="pageNavLinks">...</span> | ||
</span> | ||
<span *ngFor="let item of pages" (click)="paginate(item)"> | ||
<a class="pageNavLinks {{activePage(item)}}" [routerLink]>{{item + 1}}</a> | ||
</span> | ||
<span *ngIf="shouldShowLastPage" (click)="paginate(totalPages - 1)"> | ||
<span class="pageNavLinks">...</span> <a class="pageNavLinks" [routerLink]>{{ totalPages | ||
}}</a> | ||
</span> | ||
<button [disabled]="lastPage" (click)="nextPage()" igxButton="flat"> | ||
NEXT | ||
</button> | ||
</div> | ||
</div> | ||
</igx-paginator-content> | ||
</igx-paginator> | ||
</igx-grid> | ||
|
||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/app/grid/grid-editing-sample/grid-editing-sample.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/app/grid/grid-editing-style-sample/grid-editing-style-sample.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/app/grid/grid-group-by-paging-sample/grid-group-by-paging-sample.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/app/grid/grid-pager-sample/grid-pager-sample.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.