Merge branch 'master' of https://github.com/primefaces/primeng

primefaces · Nov 22, 2023 · dfcc8a6 · dfcc8a6 · vercel · Nov 22, 2023
2 parents ee534ea + 841281a
commit dfcc8a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/app/components/table/table.ts b/src/app/components/table/table.ts
@@ -3450,7 +3450,7 @@ export class SortIcon implements OnInit, OnDestroy {
         let multiSortMeta = this.dt._multiSortMeta;
         let index = -1;
 
-        if (multiSortMeta && this.dt.sortMode === 'multiple' && (this.dt.showInitialSortBadge || multiSortMeta.length > 1)) {
+        if (multiSortMeta && this.dt.sortMode === 'multiple' && (this.dt.showInitialSortBadge && multiSortMeta.length > 1)) {
             for (let i = 0; i < multiSortMeta.length; i++) {
                 let meta = multiSortMeta[i];
                 if (meta.field === this.field || meta.field === this.field) {

diff --git a/src/app/showcase/doc/toolbar/templatedoc.ts b/src/app/showcase/doc/toolbar/templatedoc.ts
@@ -79,7 +79,7 @@ export class TemplateDoc implements OnInit {
 </p-toolbar>`,
 
         html: `
-<ng-template class="card">
+<div class="card">
     <p-toolbar>
         <ng-template pTemplate="start">
             <p-button label="New" icon="pi pi-plus" class="mr-2"></p-button>