Skip to content

Commit

Permalink
Code format
Browse files Browse the repository at this point in the history
  • Loading branch information
cetincakiroglu committed Nov 23, 2023
1 parent 801a8cc commit 3bb279a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/app/components/multiselect/multiselect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1093,10 +1093,10 @@ export class MultiSelect implements OnInit, AfterViewInit, AfterContentInit, Aft
const modelValue = this.modelValue();
const visibleOptions = this.visibleOptions();
if (visibleOptions && ObjectUtils.isNotEmpty(visibleOptions) && modelValue) {
if(this.optionValue && this.optionLabel) {
this.selectedOptions = visibleOptions.filter((option) => modelValue.includes(option[this.optionLabel]) || modelValue.includes(option[this.optionValue]));
if (this.optionValue && this.optionLabel) {
this.selectedOptions = visibleOptions.filter((option) => modelValue.includes(option[this.optionLabel]) || modelValue.includes(option[this.optionValue]));
} else {
this.selectedOptions = [...modelValue]
this.selectedOptions = [...modelValue];
}
}
});
Expand Down
21 changes: 19 additions & 2 deletions src/app/components/paginator/paginator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,15 @@ import { PaginatorState } from './paginator.interface';
</span>
</button>
<span class="p-paginator-pages" *ngIf="showPageLinks">
<button type="button" *ngFor="let pageLink of pageLinks" class="p-paginator-page p-paginator-element p-link" [ngClass]="{ 'p-highlight': pageLink - 1 == getPage() }" [attr.aria-label]="getAriaLabel('pageLabel')" (click)="onPageLinkClick($event, pageLink - 1)" pRipple>
<button
type="button"
*ngFor="let pageLink of pageLinks"
class="p-paginator-page p-paginator-element p-link"
[ngClass]="{ 'p-highlight': pageLink - 1 == getPage() }"
[attr.aria-label]="getAriaLabel('pageLabel')"
(click)="onPageLinkClick($event, pageLink - 1)"
pRipple
>
{{ getLocalization(pageLink) }}
</button>
</span>
Expand Down Expand Up @@ -84,7 +92,16 @@ import { PaginatorState } from './paginator.interface';
<ng-template *ngTemplateOutlet="nextPageLinkIconTemplate"></ng-template>
</span>
</button>
<button *ngIf="showFirstLastIcon" type="button" [disabled]="isLastPage() || empty()" (click)="changePageToLast($event)" pRipple class="p-paginator-last p-paginator-element p-link" [ngClass]="{ 'p-disabled': isLastPage() || empty() }" [attr.aria-label]="getAriaLabel('lastPageLabel')">
<button
*ngIf="showFirstLastIcon"
type="button"
[disabled]="isLastPage() || empty()"
(click)="changePageToLast($event)"
pRipple
class="p-paginator-last p-paginator-element p-link"
[ngClass]="{ 'p-disabled': isLastPage() || empty() }"
[attr.aria-label]="getAriaLabel('lastPageLabel')"
>
<AngleDoubleRightIcon *ngIf="!lastPageLinkIconTemplate" [styleClass]="'p-paginator-icon'" />
<span class="p-paginator-icon" *ngIf="lastPageLinkIconTemplate">
<ng-template *ngTemplateOutlet="lastPageLinkIconTemplate"></ng-template>
Expand Down

2 comments on commit 3bb279a

@vercel
Copy link

@vercel vercel bot commented on 3bb279a Nov 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 3bb279a Nov 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

primeng – ./

primeng-git-prod-primetek.vercel.app
primeng-primetek.vercel.app
primeng.org

Please sign in to comment.