From dda6e90b79bcf7346ea181ddf37f5564992b43db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20=C3=87etin?=
<92744169+mehmetcetin01140@users.noreply.github.com>
Date: Tue, 12 Dec 2023 10:05:05 +0300
Subject: [PATCH 1/4] Fixed #14241 - Dropdown | Preselected value not shown
when using reactive forms
---
angular.json | 3 +++
src/app/components/dropdown/dropdown.ts | 1 +
2 files changed, 4 insertions(+)
diff --git a/angular.json b/angular.json
index 29d34b6a331..3ff4f70e5a9 100755
--- a/angular.json
+++ b/angular.json
@@ -118,5 +118,8 @@
}
}
}
+ },
+ "cli": {
+ "analytics": false
}
}
\ No newline at end of file
diff --git a/src/app/components/dropdown/dropdown.ts b/src/app/components/dropdown/dropdown.ts
index 66b7bfc15bc..2021b17ee08 100755
--- a/src/app/components/dropdown/dropdown.ts
+++ b/src/app/components/dropdown/dropdown.ts
@@ -933,6 +933,7 @@ export class Dropdown implements OnInit, AfterViewInit, AfterContentInit, AfterV
if (visibleOptions && ObjectUtils.isNotEmpty(visibleOptions)) {
this.selectedOption = visibleOptions[this.findSelectedOptionIndex()];
+ this.cd.markForCheck()
}
});
}
From cf06bcbb8d3be82e56e3d869c58a41742b2cf3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20=C3=87etin?=
<92744169+mehmetcetin01140@users.noreply.github.com>
Date: Tue, 12 Dec 2023 10:06:41 +0300
Subject: [PATCH 2/4] Delete angular.json
---
angular.json | 125 ---------------------------------------------------
1 file changed, 125 deletions(-)
delete mode 100755 angular.json
diff --git a/angular.json b/angular.json
deleted file mode 100755
index 3ff4f70e5a9..00000000000
--- a/angular.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
- "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
- "version": 1,
- "newProjectRoot": "projects",
- "projects": {
- "primeng-library": {
- "root": "src",
- "projectType": "library",
- "architect": {
- "build": {
- "builder": "@angular-devkit/build-angular:ng-packagr",
- "options": {
- "project": "src/app/components/ng-package.json",
- "tsConfig": "src/app/components/tsconfig.lib.prod.json"
- }
- }
- }
- },
- "primeng": {
- "projectType": "application",
- "schematics": {
- "@schematics/angular:component": {
- "style": "scss"
- }
- },
- "root": "",
- "sourceRoot": "src",
- "prefix": "app",
- "architect": {
- "build": {
- "builder": "@angular-devkit/build-angular:application",
- "options": {
- "outputPath": "dist/primeng",
- "index": "src/index.html",
- "browser": "src/main.ts",
- "polyfills": [
- "zone.js"
- ],
- "tsConfig": "tsconfig.app.json",
- "inlineStyleLanguage": "scss",
- "assets": [
- "src/favicon.ico",
- "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"
- ],
- "server": "src/main.server.ts",
- "ssr": {
- "entry": "server.ts"
- }
- },
- "configurations": {
- "production": {
- "outputHashing": "all"
- },
- "development": {
- "optimization": false,
- "extractLicenses": false,
- "sourceMap": true
- }
- },
- "defaultConfiguration": "production"
- },
- "serve": {
- "builder": "@angular-devkit/build-angular:dev-server",
- "configurations": {
- "production": {
- "buildTarget": "primeng:build:production"
- },
- "development": {
- "buildTarget": "primeng:build:development"
- }
- },
- "defaultConfiguration": "development"
- },
- "extract-i18n": {
- "builder": "@angular-devkit/build-angular:extract-i18n",
- "options": {
- "buildTarget": "primeng:build"
- }
- },
- "test": {
- "builder": "@angular-devkit/build-angular:karma",
- "options": {
- "polyfills": [
- "zone.js",
- "zone.js/testing"
- ],
- "tsConfig": "tsconfig.spec.json",
- "inlineStyleLanguage": "scss",
- "assets": [
- "src/favicon.ico",
- "src/assets"
- ],
- "styles": [
- "src/styles.scss"
- ],
- "scripts": []
- }
- }
- }
- }
- },
- "cli": {
- "analytics": false
- }
-}
\ No newline at end of file
From cecacccca4b4dedb5447a55ff2bfd72aa8eda5eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20=C3=87etin?=
<92744169+mehmetcetin01140@users.noreply.github.com>
Date: Tue, 12 Dec 2023 10:07:59 +0300
Subject: [PATCH 3/4] code format
---
src/app/components/dropdown/dropdown.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/components/dropdown/dropdown.ts b/src/app/components/dropdown/dropdown.ts
index 2021b17ee08..b27f9651497 100755
--- a/src/app/components/dropdown/dropdown.ts
+++ b/src/app/components/dropdown/dropdown.ts
@@ -933,7 +933,7 @@ export class Dropdown implements OnInit, AfterViewInit, AfterContentInit, AfterV
if (visibleOptions && ObjectUtils.isNotEmpty(visibleOptions)) {
this.selectedOption = visibleOptions[this.findSelectedOptionIndex()];
- this.cd.markForCheck()
+ this.cd.markForCheck();
}
});
}
From 0a848eb2111d660700006f6651d636fb2efce177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20=C3=87etin?=
<92744169+mehmetcetin01140@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:17:04 +0300
Subject: [PATCH 4/4] Fixed #14294 - Listbox | emptyMessage not working
---
src/app/components/listbox/listbox.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/components/listbox/listbox.ts b/src/app/components/listbox/listbox.ts
index f5985e586c3..10d6141cbce 100755
--- a/src/app/components/listbox/listbox.ts
+++ b/src/app/components/listbox/listbox.ts
@@ -207,7 +207,7 @@ export const LISTBOX_VALUE_ACCESSOR: any = {
- {{ emptyMessageText }}
+ {{ emptyMessage }}
@@ -219,7 +219,7 @@ export const LISTBOX_VALUE_ACCESSOR: any = {
- {{ emptyMessageText }}
+ {{ emptyMessage }}
{{ selectedMessageText }}