Skip to content

Commit

Permalink
Merge pull request #87 from tonysamperi/v17
Browse files Browse the repository at this point in the history
V17
  • Loading branch information
tonysamperi authored Nov 8, 2023
2 parents e1abe6a + 35cdd8e commit 1d0b5fc
Show file tree
Hide file tree
Showing 13 changed files with 3,149 additions and 2,181 deletions.
18 changes: 3 additions & 15 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,18 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"development": {
"browserTarget": "ngx-mat-timepicker-repo:build:development"
"buildTarget": "ngx-mat-timepicker-repo:build:development"
},
"production": {
"browserTarget": "ngx-mat-timepicker-repo:build:production"
"buildTarget": "ngx-mat-timepicker-repo:build:production"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ngx-mat-timepicker-repo:build"
"buildTarget": "ngx-mat-timepicker-repo:build"
}
},
"test": {
Expand Down Expand Up @@ -166,18 +166,6 @@
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "projects/ngx-mat-timepicker-repo/e2e/protractor.conf.js",
"devServerTarget": "ngx-mat-timepicker-repo:serve"
},
"configurations": {
"production": {
"devServerTarget": "ngx-mat-timepicker-repo:serve:production"
}
}
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#17.0.0
* Update for Angular 17! 🎉

#16.1.2
* Fix weird behaviours caused by multiple pickers in same page (fixes [#29](https://github.com/tonysamperi/ngx-mat-timepicker/issues/29))

Expand Down
37 changes: 19 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-mat-timepicker",
"version": "16.1.2",
"name": "ngx-mat-timepicker-repo",
"version": "17.0.0",
"build": 0,
"license": "MIT",
"private": true,
Expand Down Expand Up @@ -42,27 +42,28 @@
"e2e": "ng e2e"
},
"dependencies": {
"@angular/animations": "^16.0.0",
"@angular/cdk": "^16.0.0",
"@angular/common": "^16.0.0",
"@angular/compiler": "^16.0.0",
"@angular/core": "^16.0.0",
"@angular/forms": "^16.0.0",
"@angular/material": "^16.0.0",
"@angular/platform-browser": "^16.0.0",
"@angular/platform-browser-dynamic": "^16.0.0",
"@angular/animations": "^17.0.0",
"@angular/cdk": "^17.0.0-next.7",
"@angular/common": "^17.0.0",
"@angular/compiler": "^17.0.0",
"@angular/core": "^17.0.0",
"@angular/forms": "^17.0.0",
"@angular/material": "^17.0.0",
"@angular/platform-browser": "^17.0.0",
"@angular/platform-browser-dynamic": "^17.0.0",
"@angular/ssr": "^17.0.0",
"rxjs": "^7.4.0",
"t-writer.js": "^1.0.4",
"ts-luxon": "^4.3.2",
"tslib": "^2.5.2",
"typewriter-effect": "^2.19.0",
"zone.js": "^0.12.0"
"zone.js": "^0.14.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^16.0.0",
"@angular/cli": "^16.0.0",
"@angular/compiler-cli": "^16.0.0",
"@angular/language-service": "^16.0.0",
"@angular-devkit/build-angular": "^17.0.0",
"@angular/cli": "^17.0.0",
"@angular/compiler-cli": "^17.0.0",
"@angular/language-service": "^17.0.0",
"@types/jasmine": "~4.0.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^14.18.3",
Expand All @@ -76,15 +77,15 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"ng-packagr": "^16.0.0",
"ng-packagr": "^17.0.0",
"plugin-log": "^0.1.0",
"prismjs": "^1.29.0",
"semver": "^7.3.8",
"through2": "^4.0.2",
"ts-node": "~10.9.1",
"tslint": "^6.1.3",
"tslint-consistent-codestyle": "^1.16.0",
"typescript": "~5.0.0"
"typescript": "~5.2.2"
},
"engines": {
"node": ">=14.20.0"
Expand Down
33 changes: 0 additions & 33 deletions projects/ngx-mat-timepicker-repo/e2e/protractor.conf.js

This file was deleted.

23 changes: 0 additions & 23 deletions projects/ngx-mat-timepicker-repo/e2e/src/app.e2e-spec.ts

This file was deleted.

11 changes: 0 additions & 11 deletions projects/ngx-mat-timepicker-repo/e2e/src/app.po.ts

This file was deleted.

12 changes: 0 additions & 12 deletions projects/ngx-mat-timepicker-repo/e2e/tsconfig.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ export const NGX_MAT_TIMEPICKER_ENVIRONMENT = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
import "zone.js/dist/zone-error"; // Included with Angular CLI.
// import "zone.js/dist/zone-error"; // Included with Angular CLI.
18 changes: 9 additions & 9 deletions projects/ngx-mat-timepicker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-mat-timepicker",
"version": "16.1.2",
"version": "17.0.0",
"license": "MIT",
"description": "ngx-mat-timepicker is an Angular material 9+ extension to add time pickers!",
"homepage": "https://tonysamperi.github.io/ngx-mat-timepicker",
Expand Down Expand Up @@ -28,13 +28,13 @@
"tslib": "^2.5.2"
},
"peerDependencies": {
"@angular/animations": "^16.0.0",
"@angular/cdk": "^16.0.0",
"@angular/common": "^16.0.0",
"@angular/compiler": "^16.0.0",
"@angular/core": "^16.0.0",
"@angular/forms": "^16.0.0",
"@angular/material": "^16.0.0",
"@angular/platform-browser": "^16.0.0"
"@angular/animations": "^17.0.0",
"@angular/cdk": "^17.0.0",
"@angular/common": "^17.0.0",
"@angular/compiler": "^17.0.0",
"@angular/core": "^17.0.0",
"@angular/forms": "^17.0.0",
"@angular/material": "^17.0.0",
"@angular/platform-browser": "^17.0.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@
}

}

Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
ngx-mat-timepicker-face {
[mat-mini-fab].mat-unthemed {
--mdc-fab-container-color: transparent;

&:disabled[disabled] {
--mdc-fab-container-color: transparent;
}
}

.clock-face {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class NgxMatTimepickerDirective implements ControlValueAccessor, OnDestro
}

onTouched = () => {
}
};

registerOnChange(fn: (value: any) => void): void {
this._onChange = fn;
Expand Down Expand Up @@ -208,7 +208,7 @@ export class NgxMatTimepickerDirective implements ControlValueAccessor, OnDestro
}

private _onChange: (value: any) => void = () => {
}
};

private _registerTimepicker(picker: NgxMatTimepickerComponent): void {
if (picker) {
Expand Down
Loading

0 comments on commit 1d0b5fc

Please sign in to comment.