Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* fix(angular): support replaceUrl with angular <7.2 (ionic-team#18106)

* fix(angular): support replaceUrl with angular <7.2

* run linter

* fix(): sanitize components using innerHTML (ionic-team#18146)

* 4.3.1 (ionic-team#18150)
  • Loading branch information
liamdebeasi authored and kiku-jw committed May 16, 2019
1 parent 8154f9f commit 7aafed7
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 7 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## [4.3.1](https://github.com/ionic-team/ionic/compare/v4.3.0...v4.3.1) (2019-04-26)


### Bug Fixes

* **angular:** support replaceUrl with angular <7.2 ([#18106](https://github.com/ionic-team/ionic/issues/18106)) ([eb3cbe4](https://github.com/ionic-team/ionic/commit/eb3cbe4))
* **security:** sanitize components using innerHTML ([#18146](https://github.com/ionic-team/ionic/issues/18146)) ([b839e6f](https://github.com/ionic-team/ionic/commit/b839e6f))



# [4.3.0 Lithium](https://github.com/ionic-team/ionic/compare/v4.2.0...v4.3.0) (2019-04-17)


Expand Down
4 changes: 2 additions & 2 deletions angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ionic/angular",
"version": "4.3.0",
"version": "4.3.1",
"description": "Angular specific wrappers for @ionic/core",
"keywords": [
"ionic",
Expand Down Expand Up @@ -45,7 +45,7 @@
"css/"
],
"dependencies": {
"@ionic/core": "4.3.0",
"@ionic/core": "4.3.1",
"tslib": "^1.9.3"
},
"peerDependencies": {
Expand Down
17 changes: 16 additions & 1 deletion angular/src/directives/navigation/stack-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,22 @@ export class StackController {
}
const viewsSnapshot = this.views.slice();

const currentNavigation = this.router.getCurrentNavigation();
let currentNavigation;

const router = (this.router as any);

// Angular >= 7.2.0
if (router.getCurrentNavigation) {
currentNavigation = router.getCurrentNavigation();

// Angular < 7.2.0
} else if (
router.navigations &&
router.navigations.value
) {
currentNavigation = router.navigations.value;
}

/**
* If the navigation action
* sets `replaceUrl: true`
Expand Down
4 changes: 2 additions & 2 deletions core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ The Ionic Core package contains the Web Components that make up the reusable UI
Easiest way to start using Ionic Core is by adding a script tag to the CDN:

```html
<link href="https://unpkg.com/@ionic/[email protected].0/css/ionic.bundle.css" rel="stylesheet">
<script src="https://unpkg.com/@ionic/[email protected].0/dist/ionic.js"></script>
<link href="https://unpkg.com/@ionic/[email protected].1/css/ionic.bundle.css" rel="stylesheet">
<script src="https://unpkg.com/@ionic/[email protected].1/dist/ionic.js"></script>
```

Any Ionic component added to the webpage will automatically load. This includes writing the component tag directly in HTML, or using JavaScript such as `document.createElement('ion-toggle')`.
Expand Down
2 changes: 1 addition & 1 deletion core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ionic/core",
"version": "4.3.0",
"version": "4.3.1",
"description": "Base components for Ionic",
"keywords": [
"ionic",
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ionic/docs",
"version": "4.3.0",
"version": "4.3.1",
"description": "Pre-packaged API documentation for the Ionic docs.",
"main": "core.json",
"files": [
Expand Down

0 comments on commit 7aafed7

Please sign in to comment.