From 4127fac88e3a33192ba2af081516abd5a2a29c73 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Fri, 16 Feb 2018 09:10:20 -0600 Subject: [PATCH 1/4] chore(dependencies): tick to 0.0.2 --- packages/core/package-lock.json | 2 +- packages/core/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json index 040009a3f1..f1ee56f449 100644 --- a/packages/core/package-lock.json +++ b/packages/core/package-lock.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "0.0.2-66", + "version": "0.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index 2352b387d3..9cb2382fd5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "0.0.2-66", + "version": "0.0.2", "description": "Base components for Ionic", "main": "dist/ionic.js", "types": "dist/types/index.d.ts", From a7670e5c307687926110fe4c617ca672ae60762e Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Fri, 16 Feb 2018 09:13:43 -0600 Subject: [PATCH 2/4] chore(dependencies): update to 0.0.2 of ionic core --- packages/angular/package-lock.json | 14 +++++++------- packages/angular/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/angular/package-lock.json b/packages/angular/package-lock.json index 8ca2294ff5..d3b902515c 100644 --- a/packages/angular/package-lock.json +++ b/packages/angular/package-lock.json @@ -216,9 +216,9 @@ } }, "@ionic/core": { - "version": "0.0.2-66", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.0.2-66.tgz", - "integrity": "sha512-Wv3tewr1Se0W1UHmMS/LPq48HDXGFafDHs3I7626WTD2JxpSEGLyd6pHeJcMNbi3SDWPiya7erjd6e4oOEZX6g==", + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.0.2.tgz", + "integrity": "sha512-aMqK+wb4Ajzfz2rZ5i2ojAHjmG/D4XhbgIIdDgRmK53mcIG9OQ1F/fQ8+i5I6coI0k8Qc456FOF8K5eZ1nIB6A==", "dev": true }, "@stencil/core": { @@ -957,7 +957,7 @@ "pbkdf2": "3.0.14", "public-encrypt": "4.0.0", "randombytes": "2.0.6", - "randomfill": "1.0.3" + "randomfill": "1.0.4" } }, "cssom": { @@ -3975,9 +3975,9 @@ } }, "randomfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz", - "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", + "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "requires": { "randombytes": "2.0.6", "safe-buffer": "5.1.1" diff --git a/packages/angular/package.json b/packages/angular/package.json index b5fe341c47..d5f466e952 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -42,7 +42,7 @@ "@angular/platform-browser": "latest", "@angular/platform-browser-dynamic": "latest", "@angular/router": "latest", - "@ionic/core": "next", + "@ionic/core": "0.0.2", "glob": "7.1.2", "ionicons": "~3.0.0", "rxjs": "5.5.2", From 939d3da7afeaa79a3133d13bb27ab514807308fe Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Fri, 16 Feb 2018 09:28:29 -0600 Subject: [PATCH 3/4] chore(dependencies): update --- packages/demos/angular/package-lock.json | 14 +++++++------- packages/demos/angular/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/demos/angular/package-lock.json b/packages/demos/angular/package-lock.json index 309d32fb90..78a9f2c7ea 100644 --- a/packages/demos/angular/package-lock.json +++ b/packages/demos/angular/package-lock.json @@ -512,9 +512,9 @@ } }, "@ionic/core": { - "version": "0.0.2-66", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.0.2-66.tgz", - "integrity": "sha512-Wv3tewr1Se0W1UHmMS/LPq48HDXGFafDHs3I7626WTD2JxpSEGLyd6pHeJcMNbi3SDWPiya7erjd6e4oOEZX6g==" + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.0.2.tgz", + "integrity": "sha512-aMqK+wb4Ajzfz2rZ5i2ojAHjmG/D4XhbgIIdDgRmK53mcIG9OQ1F/fQ8+i5I6coI0k8Qc456FOF8K5eZ1nIB6A==" }, "@ngtools/json-schema": { "version": "1.2.0", @@ -2221,7 +2221,7 @@ "pbkdf2": "3.0.14", "public-encrypt": "4.0.0", "randombytes": "2.0.6", - "randomfill": "1.0.3" + "randomfill": "1.0.4" } }, "css-parse": { @@ -8420,9 +8420,9 @@ } }, "randomfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz", - "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", + "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "requires": { "randombytes": "2.0.6", "safe-buffer": "5.1.1" diff --git a/packages/demos/angular/package.json b/packages/demos/angular/package.json index cd2ad2884d..dd96c644a2 100644 --- a/packages/demos/angular/package.json +++ b/packages/demos/angular/package.json @@ -23,7 +23,7 @@ "@angular/platform-browser-dynamic": "latest", "@angular/router": "latest", "@ionic/angular": "next", - "@ionic/core": "next", + "@ionic/core": "0.0.2", "body-parser": "^1.18.2", "core-js": "^2.4.1", "express": "^4.16.2", From 45311fc7d46a5befde493d780d8f364933cbdec4 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Fri, 16 Feb 2018 09:52:44 -0600 Subject: [PATCH 4/4] test(nav): nav then tabs test --- .../src/components/nav/test/basic/index.html | 17 +- .../nav/test/nav-then-tabs/index.html | 387 ++++++++++++++++++ .../nav/test/simple-nested-navs/index.html | 33 +- 3 files changed, 417 insertions(+), 20 deletions(-) create mode 100644 packages/core/src/components/nav/test/nav-then-tabs/index.html diff --git a/packages/core/src/components/nav/test/basic/index.html b/packages/core/src/components/nav/test/basic/index.html index 5f2685543d..11fe138b16 100644 --- a/packages/core/src/components/nav/test/basic/index.html +++ b/packages/core/src/components/nav/test/basic/index.html @@ -32,6 +32,9 @@ + + + Page Two @@ -42,11 +45,7 @@ Go to Page Two -
- - Go Back - -
+
`; @@ -59,16 +58,14 @@ + + + Page Three

Page Three

-
- - Go Back - -
`; diff --git a/packages/core/src/components/nav/test/nav-then-tabs/index.html b/packages/core/src/components/nav/test/nav-then-tabs/index.html new file mode 100644 index 0000000000..ec231e47e1 --- /dev/null +++ b/packages/core/src/components/nav/test/nav-then-tabs/index.html @@ -0,0 +1,387 @@ + + + + + Nav Then Tabs + + + + + + + + + + diff --git a/packages/core/src/components/nav/test/simple-nested-navs/index.html b/packages/core/src/components/nav/test/simple-nested-navs/index.html index f37e581795..746bcdbe67 100644 --- a/packages/core/src/components/nav/test/simple-nested-navs/index.html +++ b/packages/core/src/components/nav/test/simple-nested-navs/index.html @@ -13,7 +13,9 @@ - + + + Page One @@ -42,7 +44,9 @@ - + + + Page Two Section One @@ -51,12 +55,20 @@ Go to Page Two Section Two - - Go Back - +
+ Go Back +
`; + + const button = this.querySelector('ion-button.previous'); + button.addEventListener('click', () => { + const nav = this.closest('ion-nav'); + if (nav.parent) { + nav.parent.pop(); + } + }); } } @@ -66,7 +78,9 @@ - + + + Page Two Section Two @@ -75,9 +89,6 @@ Go to Page Three - - Go Back - `; @@ -90,7 +101,9 @@ - + + + Page Three