Skip to content

Commit

Permalink
Merge branch 'primefaces:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
pete-mcwilliams authored Nov 28, 2023
2 parents e35491c + 65823e4 commit 2b97412
Show file tree
Hide file tree
Showing 636 changed files with 21,033 additions and 3,824 deletions.
48 changes: 7 additions & 41 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,40 +33,13 @@
"outputPath": "dist/primeng/browser",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": [
"zone.js"
],
"polyfills": ["zone.js"],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.png",
"src/assets",
"src/showcase",
"src/upload.php",
"src/versions.json",
"src/.htaccess"
],
"styles": [
"src/styles.scss",
"node_modules/primeicons/primeicons.css"
],
"scripts": [
"./node_modules/prismjs/prism.js",
"./node_modules/prismjs/components/prism-typescript.js",
"./node_modules/prismjs/components/prism-scss.js",
"./node_modules/prismjs/components/prism-bash.js"
],
"allowedCommonJsDependencies": [
"chart.js",
"xlsx",
"jspdf-autotable",
"file-saver",
"jspdf",
"quill",
"core-js",
"raf",
"rgbcolor"
]
"assets": ["src/assets"],
"styles": ["src/styles.scss"],
"scripts": ["./node_modules/prismjs/prism.js", "./node_modules/prismjs/components/prism-typescript.js", "./node_modules/prismjs/components/prism-scss.js", "./node_modules/prismjs/components/prism-bash.js"],
"allowedCommonJsDependencies": ["chart.js", "xlsx", "jspdf-autotable", "file-saver", "jspdf", "quill", "core-js", "raf", "rgbcolor"]
},
"configurations": {
"production": {
Expand Down Expand Up @@ -119,15 +92,8 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": [
"src/favicon.png",
"src/assets",
"src/upload.php"
],
"styles": [
"src/styles.scss",
"src/assets/components/themes/lara-light-blue/theme.css"
],
"assets": ["src/assets"],
"styles": ["src/styles.scss", "src/assets/components/themes/lara-light-blue/theme.css"],
"scripts": []
}
},
Expand Down
6 changes: 1 addition & 5 deletions src/app/showcase/data/news.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
"id": 59,
"content": "🎉 Black Friday Sale! Up to 50% Off",
"linkText": "Buy Now",
"linkHref": "https://www.primefaces.org/store",
"backgroundStyle": "background-color:#3B82F6",
"textStyle": "color:#ffffff;font-weight:500",
"linkStyle": "color:#ffffff;font-weight:700",
"linkHoverStyle": "text-decoration: underline"
"linkHref": "https://www.primefaces.org/store"
}

3 changes: 1 addition & 2 deletions src/app/showcase/doc/Image/basicdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import { Code } from '../../domain/code';
})
export class BasicDoc {
code: Code = {
basic: `
<p-image src="https://primefaces.org/cdn/primeng/images/galleria/galleria1.jpg" alt="Image" width="250"></p-image>`,
basic: `<p-image src="https://primefaces.org/cdn/primeng/images/galleria/galleria1.jpg" alt="Image" width="250"></p-image>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/Image/previewdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import { Code } from '../../domain/code';
})
export class PreviewDoc {
code: Code = {
basic: `
<p-image src="https://primefaces.org/cdn/primeng/images/galleria/galleria1.jpg" alt="Image" width="250" [preview]="true"></p-image>`,
basic: `<p-image src="https://primefaces.org/cdn/primeng/images/galleria/galleria1.jpg" alt="Image" width="250" [preview]="true"></p-image>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/Image/previewimagesourcedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import { Code } from '../../domain/code';
})
export class PreviewImageSourceDoc {
code: Code = {
basic: `
<p-image src="https://primefaces.org/cdn/primeng/images/galleria/galleria1.jpg" previewImageSrc="https://primefaces.org/cdn/primeng/images/galleria/galleria2.jpg" alt="Image" width="250" [preview]="true"></p-image>`,
basic: `<p-image src="https://primefaces.org/cdn/primeng/images/galleria/galleria1.jpg" previewImageSrc="https://primefaces.org/cdn/primeng/images/galleria/galleria2.jpg" alt="Image" width="250" [preview]="true"></p-image>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/Image/templatedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import { Code } from '../../domain/code';
})
export class TemplateDoc {
code: Code = {
basic: `
<p-image src="https://primefaces.org/cdn/primeng/images/galleria/galleria1.jpg" [preview]="true" alt="Image" width="250">
basic: `<p-image src="https://primefaces.org/cdn/primeng/images/galleria/galleria1.jpg" [preview]="true" alt="Image" width="250">
<ng-template pTemplate="indicator">
<i class="pi pi-check"></i>
</ng-template>
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/accordion/basicdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ import { Code } from '../../domain/code';
})
export class BasicDoc {
code: Code = {
basic: `
<p-accordion [activeIndex]="0">
basic: `<p-accordion [activeIndex]="0">
<p-accordionTab header="Header I">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/accordion/controlleddoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ export class ControlledDoc {
activeIndex: number | undefined;

code: Code = {
basic: `
<div class="flex flex-wrap gap-2 mb-3">
basic: `<div class="flex flex-wrap gap-2 mb-3">
<p-button [icon]="activeIndex === 0 ? 'pi pi-minus' : 'pi pi-plus'" (click)="activeIndex = 0" styleClass="p-button-text" label="Toggle 1st"></p-button>
<p-button [icon]="activeIndex === 1 ? 'pi pi-minus' : 'pi pi-plus'" (click)="activeIndex = 1" styleClass="p-button-text ml-2" label="Toggle 2st"></p-button>
<p-button [icon]="activeIndex === 2 ? 'pi pi-minus' : 'pi pi-plus'" (click)="activeIndex = 2" styleClass="p-button-text ml-2" label="Toggle 3st"></p-button>
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/accordion/disableddoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ import { Code } from '../../domain/code';
})
export class DisabledDoc {
code: Code = {
basic: `
<p-accordion [activeIndex]="0">
basic: `<p-accordion [activeIndex]="0">
<p-accordionTab header="Header I">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/accordion/multipledoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ import { Code } from '../../domain/code';
})
export class MultipleDoc {
code: Code = {
basic: `
<p-accordion [multiple]="true" [activeIndex]="[0]">
basic: `<p-accordion [multiple]="true" [activeIndex]="[0]">
<p-accordionTab header="Header I">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/accordion/templatedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ import { Code } from '../../domain/code';
})
export class TemplateDoc {
code: Code = {
basic: `
<p-accordion class="w-full">
basic: `<p-accordion class="w-full">
<p-accordionTab>
<ng-template pTemplate="header">
<div class="flex align-items-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/animateonscroll/basicdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ import { Code } from '../../domain/code';
})
export class BasicDoc {
code: Code = {
basic: `
<div class="flex flex-column align-items-center gap-2">
basic: `<div class="flex flex-column align-items-center gap-2">
<span class="text-xl font-medium">Scroll Down</span>
<span class="slidedown-icon h-2rem w-2rem bg-primary border-circle inline-flex align-items-center justify-content-center">
<i class="pi pi-arrow-down"></i>
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/basicdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ export class BasicDoc {
}

code: Code = {
basic: `
<p-autoComplete [(ngModel)]="selectedItem" [suggestions]="suggestions" (completeMethod)="search($event)"></p-autoComplete>`,
basic: `<p-autoComplete [(ngModel)]="selectedItem" [suggestions]="suggestions" (completeMethod)="search($event)"></p-autoComplete>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/disableddoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ export class DisabledDoc {
}

code: Code = {
basic: `
<p-autoComplete [(ngModel)]="selectedItem" [suggestions]="suggestions" (completeMethod)="search($event)" [disabled]="true"></p-autoComplete>`,
basic: `<p-autoComplete [(ngModel)]="selectedItem" [suggestions]="suggestions" (completeMethod)="search($event)" [disabled]="true"></p-autoComplete>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/dropdowndoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ export class DropdownDoc implements OnInit {
}

code: Code = {
basic: `
<p-autoComplete [(ngModel)]="selectedCountry" [dropdown]="true" [suggestions]="filteredCountries" (completeMethod)="filterCountry($event)" field="name"></p-autoComplete>`,
basic: `<p-autoComplete [(ngModel)]="selectedCountry" [dropdown]="true" [suggestions]="filteredCountries" (completeMethod)="filterCountry($event)" field="name"></p-autoComplete>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/floatlabeldoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ export class FloatLabelDoc {
}

code: Code = {
basic: `
<span class="p-float-label">
basic: `<span class="p-float-label">
<p-autoComplete [(ngModel)]="selectedItem" [suggestions]="suggestions" (completeMethod)="search($event)" inputId="float-label"></p-autoComplete>
<label for="float-label">Float Label</label>
</span>`,
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/forceselectiondoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ export class ForceSelectionDoc implements OnInit {
}

code: Code = {
basic: `
<p-autoComplete [(ngModel)]="selectedCountry" [forceSelection]="true" [suggestions]="filteredCountries" (completeMethod)="filterCountry($event)" field="name"></p-autoComplete>`,
basic: `<p-autoComplete [(ngModel)]="selectedCountry" [forceSelection]="true" [suggestions]="filteredCountries" (completeMethod)="filterCountry($event)" field="name"></p-autoComplete>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/groupeddoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ export class GroupedDoc implements OnInit {
}

code: Code = {
basic: `
<p-autoComplete [(ngModel)]="selectedCity" [group]="true" [suggestions]="filteredGroups" (completeMethod)="filterGroupedCity($event)" [dropdown]="true">
basic: `<p-autoComplete [(ngModel)]="selectedCity" [group]="true" [suggestions]="filteredGroups" (completeMethod)="filterGroupedCity($event)" [dropdown]="true">
<ng-template let-group pTemplate="group">
<div class="flex align-items-center">
<img src="https://primefaces.org/cdn/primeng/images/demo/flag/flag_placeholder.png" [class]="'mr-2 flag flag-' + group.value" style="width: 20px" />
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/invaliddoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ export class InvalidDoc {
}

code: Code = {
basic: `
<p-autoComplete [(ngModel)]="selectedItem" [suggestions]="suggestions" class="ng-invalid ng-dirty" (completeMethod)="search($event)"></p-autoComplete>`,
basic: `<p-autoComplete [(ngModel)]="selectedItem" [suggestions]="suggestions" class="ng-invalid ng-dirty" (completeMethod)="search($event)"></p-autoComplete>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/multipledoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ export class MultipleDoc {
}

code: Code = {
basic: `
<span class="p-fluid">
basic: `<span class="p-fluid">
<p-autoComplete [(ngModel)]="selectedItems" [suggestions]="items" (completeMethod)="filterCountry($event)" [multiple]="true"></p-autoComplete>
</span>`,

Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/objectsdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ export class ObjectsDoc implements OnInit {
}

code: Code = {
basic: `
<p-autoComplete [(ngModel)]="selectedCountry" [suggestions]="filteredCountries" (completeMethod)="filterCountry($event)" field="name"></p-autoComplete>`,
basic: `<p-autoComplete [(ngModel)]="selectedCountry" [suggestions]="filteredCountries" (completeMethod)="filterCountry($event)" field="name"></p-autoComplete>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/reactiveformsdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ export class ReactiveFormsDoc implements OnInit {
}

code: Code = {
basic: `
<form [formGroup]="formGroup">
basic: `<form [formGroup]="formGroup">
<p-autoComplete formControlName="selectedCountry" [suggestions]="filteredCountries" (completeMethod)="filterCountry($event)" field="name"></p-autoComplete>
</form>`,

Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/templatedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ export class TemplateDoc {
}

code: Code = {
basic: `
<p-autoComplete [(ngModel)]="selectedCountryAdvanced" [suggestions]="filteredCountries"
basic: `<p-autoComplete [(ngModel)]="selectedCountryAdvanced" [suggestions]="filteredCountries"
(completeMethod)="filterCountry($event)" field="name" [dropdown]="true">
<ng-template let-country pTemplate="item">
<div class="flex align-items-center gap-2">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autocomplete/virtualscrolldoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ export class VirtualScrollDoc {
}

code: Code = {
basic: `
<p-autoComplete [(ngModel)]="selectedItem" [virtualScroll]="true" [suggestions]="filteredItems" [virtualScrollItemSize]="34" (completeMethod)="filterItems($event)" field="label" [dropdown]="true"> </p-autoComplete>`,
basic: `<p-autoComplete [(ngModel)]="selectedItem" [virtualScroll]="true" [suggestions]="filteredItems" [virtualScrollItemSize]="34" (completeMethod)="filterItems($event)" field="label" [dropdown]="true"> </p-autoComplete>`,

html: `
<div class="card flex justify-content-center">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/autofocus/basicdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import { Code } from '../../domain/code';
})
export class BasicDoc {
code: Code = {
basic: `
<input type="text" pInputText pAutoFocus [autofocus]="true" placeholder="Automatically focused" />`,
basic: `<input type="text" pInputText pAutoFocus [autofocus]="true" placeholder="Automatically focused" />`,
html: `
<div class="card flex justify-content-center">
<input type="text" pInputText pAutoFocus [autofocus]="true" placeholder="Automatically focused" />
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/avatar/avatargroupdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import { Code } from '../../domain/code';
})
export class GroupDoc {
code: Code = {
basic: `
<p-avatarGroup styleClass="mb-3">
basic: `<p-avatarGroup styleClass="mb-3">
<p-avatar image="https://primefaces.org/cdn/primeng/images/demo/avatar/amyelsner.png" size="large" shape="circle"></p-avatar>
<p-avatar image="https://primefaces.org/cdn/primeng/images/demo/avatar/asiyajavayant.png" size="large" shape="circle"></p-avatar>
</p-avatarGroup>`,
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/avatar/badgedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import { Code } from '../../domain/code';
})
export class BadgeDoc {
code: Code = {
basic: `
<p-avatar image="https://primefaces.org/cdn/primeng/images/demo/avatar/amyelsner.png" pBadge value="4" severity="danger"></p-avatar>`,
basic: `<p-avatar image="https://primefaces.org/cdn/primeng/images/demo/avatar/amyelsner.png" pBadge value="4" severity="danger"></p-avatar>`,
html: `
<div class="card flex justify-content-center">
<p-avatar image="https://primefaces.org/cdn/primeng/images/demo/avatar/amyelsner.png" pBadge value="4" severity="danger"></p-avatar>
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/avatar/icondoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ import { Code } from '../../domain/code';
})
export class IconDoc {
code: Code = {
basic: `
<p-avatar icon="pi pi-user" styleClass="mr-2" size="xlarge"></p-avatar>`,
basic: `<p-avatar icon="pi pi-user" styleClass="mr-2" size="xlarge"></p-avatar>`,
html: `
<div class="grid card grid-nogutter">
<div class="col-12 md:col-4">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/avatar/imagedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ import { Code } from '../../domain/code';
})
export class ImageDoc {
code: Code = {
basic: `
<p-avatar image="https://primefaces.org/cdn/primeng/images/demo/avatar/amyelsner.png" styleClass="mr-2" size="xlarge" shape="circle"></p-avatar>`,
basic: `<p-avatar image="https://primefaces.org/cdn/primeng/images/demo/avatar/amyelsner.png" styleClass="mr-2" size="xlarge" shape="circle"></p-avatar>`,
html: `
<div class="card">
<p-avatar image="https://primefaces.org/cdn/primeng/images/demo/avatar/amyelsner.png" styleClass="mr-2" size="xlarge" shape="circle"></p-avatar>
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/avatar/labeldoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ import { Code } from '../../domain/code';
})
export class LabelDoc {
code: Code = {
basic: `
<div class="col-12 md:col-4">
basic: `<div class="col-12 md:col-4">
<h5>Label</h5>
<p-avatar label="P" styleClass="mr-2" size="xlarge"></p-avatar>
<p-avatar label="V" styleClass="mr-2" size="large" [style]="{ 'background-color': '#2196F3', color: '#ffffff' }"></p-avatar>
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/avatar/shapedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import { Code } from '../../domain/code';
})
export class ShapeDoc {
code: Code = {
basic: `
<p-avatar label="P" shape="circle"></p-avatar>
basic: `<p-avatar label="P" shape="circle"></p-avatar>
<p-avatar label="T"></p-avatar>`,
html: `
<div class="card flex justify-content-center gap-2">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/avatar/sizedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import { Code } from '../../domain/code';
})
export class SizeDoc {
code: Code = {
basic: `
<p-avatar label="P" size="large"></p-avatar>
basic: `<p-avatar label="P" size="large"></p-avatar>
<p-avatar label="T" size="xlarge"></p-avatar>`,
html: `
<div class="card flex justify-content-center gap-2">
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/avatar/templatedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ import { Code } from '../../domain/code';
})
export class TemplateDoc {
code: Code = {
basic: `
<p-avatar size="xlarge">
basic: `<p-avatar size="xlarge">
<span class="text-base">Content</span>
</p-avatar>`,
html: `
Expand Down
3 changes: 1 addition & 2 deletions src/app/showcase/doc/badge/basicdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import { Code } from '../../domain/code';
})
export class BasicDoc {
code: Code = {
basic: `
<p-badge [value]="2"></p-badge>`,
basic: `<p-badge [value]="2"></p-badge>`,
html: `
<div class="card flex justify-content-center">
<p-badge [value]="2"></p-badge>
Expand Down
Loading

0 comments on commit 2b97412

Please sign in to comment.