javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): resolve merge conflicts

Browse Source
This commit is contained in:
Liam DeBeasi
2021-06-21 14:03:47 -04:00
parent 80f181d484 68c0e7136d
commit 5db60d9697
32 changed files with 278 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
angular/package-lock.json generated
View File

@@ -1,15 +1,15 @@
{
"name": "@ionic/angular",
"version": "5.6.7",
"version": "5.6.9",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@ionic/angular",
"version": "5.6.7",
"version": "5.6.9",
"license": "MIT",
"dependencies": {
"@ionic/core": "5.6.6",
"@ionic/core": "5.6.8",
"tslib": "^1.9.3"
},
"devDependencies": {
@@ -204,9 +204,9 @@
}
},
"node_modules/@ionic/core": {
"version": "5.6.6",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
"integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
"version": "5.6.8",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.8.tgz",
"integrity": "sha512-JWrRGzw4SyyemjycPEh516fAkgFVtLp6RMPTH3uzK8L+DLfqJ/QU4Uccu89QqdcG/TBD75r3wkUtbKL2YlL8PQ==",
"dependencies": {
"@stencil/core": "^2.4.0",
"ionicons": "^5.5.1",
@@ -5156,9 +5156,9 @@
}
},
"@ionic/core": {
"version": "5.6.6",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.6.tgz",
"integrity": "sha512-EbVIXOTVVPxBo7hsarBpRSFNsQ22wBFtWkKmrmliieknG5LUkf5WZBpj4EENQhzYA6c+//7/nfhcD9pWgtAofA==",
"version": "5.6.8",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.8.tgz",
"integrity": "sha512-JWrRGzw4SyyemjycPEh516fAkgFVtLp6RMPTH3uzK8L+DLfqJ/QU4Uccu89QqdcG/TBD75r3wkUtbKL2YlL8PQ==",
"requires": {
"@stencil/core": "^2.4.0",
"ionicons": "^5.5.1",

4
angular/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@ionic/angular",
"version": "5.6.7",
"version": "5.6.9",
"description": "Angular specific wrappers for @ionic/core",
"keywords": [
"ionic",
@@ -42,7 +42,7 @@
"validate": "npm i && npm run lint && npm run test && npm run build"
},
"dependencies": {
"@ionic/core": "5.6.7",
"@ionic/core": "5.6.9",
"tslib": "^1.9.3"
},
"peerDependencies": {

2
angular/src/providers/platform.ts
View File

@@ -209,7 +209,7 @@ export class Platform {
}
/**
* Returns `true` if the app is in portait mode.
* Returns `true` if the app is in portrait mode.
*/
isPortrait(): boolean {
return this.win.matchMedia && this.win.matchMedia('(orientation: portrait)').matches;