diff --git a/packages/demos/angular/package-lock.json b/packages/demos/angular/package-lock.json index 420b99c2bd..5f43d068ec 100644 --- a/packages/demos/angular/package-lock.json +++ b/packages/demos/angular/package-lock.json @@ -63,7 +63,7 @@ "common-tags": "1.6.0", "copy-webpack-plugin": "4.3.1", "core-object": "3.1.5", - "css-loader": "0.28.7", + "css-loader": "0.28.8", "cssnano": "3.10.0", "denodeify": "1.2.1", "ember-cli-string-utils": "1.1.0", @@ -385,9 +385,9 @@ } }, "@types/node": { - "version": "6.0.95", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.95.tgz", - "integrity": "sha512-d1Twx1NM49dQ7jbNZfaHTQWuYL9cFVrGxYpbc3BvMf4626lOJOZnp2aJQNB9vP/WX3UOe1TrTUMABrGRu6FZhg==", + "version": "6.0.96", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.96.tgz", + "integrity": "sha512-fsOOY6tMQ3jCB2wD51XFDmmpgm4wVKkJECdcVRqapbJEa7awJDcr+SaH8toz+4r4KW8YQ3M7ybXMoSDo1QGewA==", "dev": true }, "@types/q": { @@ -729,7 +729,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000787", + "caniuse-db": "1.0.30000789", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "5.2.18", @@ -1109,7 +1109,7 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000787", + "caniuse-db": "1.0.30000789", "electron-to-chromium": "1.3.30" } }, @@ -1154,9 +1154,9 @@ "dev": true }, "cacache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.1.tgz", - "integrity": "sha512-dRHYcs9LvG9cHgdPzjiI+/eS7e1xRhULrcyOx04RZQsszNJXU2SL9CyG60yLnge282Qq5nwTv+ieK2fH+WPZmA==", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.2.tgz", + "integrity": "sha512-dljb7dk1jqO5ogE+dRpoR9tpHYv5xz9vPSNunh1+0wRuNdYxmzp9WmsyokgW/DUF1FDRVA/TMsmxt027R8djbQ==", "dev": true, "requires": { "bluebird": "3.5.1", @@ -1211,15 +1211,15 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000787", + "caniuse-db": "1.0.30000789", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" } }, "caniuse-db": { - "version": "1.0.30000787", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000787.tgz", - "integrity": "sha1-ygeigb5Taoi9f6yWuolfPPU/gRs=", + "version": "1.0.30000789", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000789.tgz", + "integrity": "sha1-XPP+x1SABBqxYsoGQTFTFB4jQyU=", "dev": true }, "caseless": { @@ -1648,7 +1648,7 @@ "integrity": "sha512-xlcFiW/U7KrpS6dFuWq3r8Wb7koJx7QVc7LDFCosqkikaVSxkaYOnwDLwilbjrszZ0LYZXThDAJKcQCSrvdShQ==", "dev": true, "requires": { - "cacache": "10.0.1", + "cacache": "10.0.2", "find-cache-dir": "1.0.0", "globby": "7.1.1", "is-glob": "4.0.0", @@ -1855,9 +1855,9 @@ "dev": true }, "css-loader": { - "version": "0.28.7", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz", - "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==", + "version": "0.28.8", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.8.tgz", + "integrity": "sha512-4jGj7Ag6WUZ5lQyE4te9sJLn0lgkz6HI3WDE4aw98AkW1IAKXPP4blTpPeorlLDpNsYvojo0SYgRJOdz2KbuAw==", "dev": true, "requires": { "babel-code-frame": "6.26.0", @@ -4344,7 +4344,7 @@ "ncname": "1.0.0", "param-case": "2.1.1", "relateurl": "0.2.7", - "uglify-js": "3.3.4" + "uglify-js": "3.3.5" }, "dependencies": { "commander": { @@ -4360,9 +4360,9 @@ "dev": true }, "uglify-js": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.4.tgz", - "integrity": "sha512-hfIwuAQI5dlXP30UtdmWoYF9k+ypVqBXIdmd6ZKBiaNHHvA8ty7ZloMe3+7S5AEKVkxHbjByl4DfRHQ7QpZquw==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.5.tgz", + "integrity": "sha512-ZebM2kgBL/UI9rKeAbsS2J0UPPv7SBy5hJNZml/YxB1zC6JK8IztcPs+cxilE4pu0li6vadVSFqiO7xFTKuSrg==", "dev": true, "requires": { "commander": "2.12.2", @@ -4561,7 +4561,7 @@ "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", "dev": true, "requires": { - "postcss": "6.0.15" + "postcss": "6.0.16" }, "dependencies": { "ansi-styles": { @@ -4596,9 +4596,9 @@ } }, "postcss": { - "version": "6.0.15", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", - "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", + "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", "dev": true, "requires": { "chalk": "2.3.0", @@ -6782,13 +6782,13 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz", "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", "requires": { - "@types/node": "8.5.5" + "@types/node": "9.3.0" }, "dependencies": { "@types/node": { - "version": "8.5.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.5.tgz", - "integrity": "sha512-JRnfoh0Ll4ElmIXKxbUfcOodkGvcNHljct6mO1X9hE/mlrMzAx0hYCLAD7sgT53YAY1HdlpzUcV0CkmDqUqTuA==" + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz", + "integrity": "sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw==" } } }, @@ -7025,7 +7025,7 @@ "dev": true, "requires": { "balanced-match": "1.0.0", - "postcss": "6.0.15" + "postcss": "6.0.16" }, "dependencies": { "ansi-styles": { @@ -7060,9 +7060,9 @@ } }, "postcss": { - "version": "6.0.15", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", - "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", + "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", "dev": true, "requires": { "chalk": "2.3.0", @@ -7277,7 +7277,7 @@ "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=", "dev": true, "requires": { - "postcss": "6.0.15" + "postcss": "6.0.16" }, "dependencies": { "ansi-styles": { @@ -7312,9 +7312,9 @@ } }, "postcss": { - "version": "6.0.15", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", - "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", + "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", "dev": true, "requires": { "chalk": "2.3.0", @@ -7346,7 +7346,7 @@ "dev": true, "requires": { "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.15" + "postcss": "6.0.16" }, "dependencies": { "ansi-styles": { @@ -7381,9 +7381,9 @@ } }, "postcss": { - "version": "6.0.15", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", - "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", + "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", "dev": true, "requires": { "chalk": "2.3.0", @@ -7415,7 +7415,7 @@ "dev": true, "requires": { "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.15" + "postcss": "6.0.16" }, "dependencies": { "ansi-styles": { @@ -7450,9 +7450,9 @@ } }, "postcss": { - "version": "6.0.15", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", - "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", + "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", "dev": true, "requires": { "chalk": "2.3.0", @@ -7484,7 +7484,7 @@ "dev": true, "requires": { "icss-replace-symbols": "1.1.0", - "postcss": "6.0.15" + "postcss": "6.0.16" }, "dependencies": { "ansi-styles": { @@ -7519,9 +7519,9 @@ } }, "postcss": { - "version": "6.0.15", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", - "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", + "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", "dev": true, "requires": { "chalk": "2.3.0", @@ -7732,7 +7732,7 @@ "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=", "dev": true, "requires": { - "@types/node": "6.0.95", + "@types/node": "6.0.96", "@types/q": "0.0.32", "@types/selenium-webdriver": "2.53.43", "blocking-proxy": "0.0.5", @@ -9447,13 +9447,13 @@ "resolve": "1.5.0", "semver": "5.4.1", "tslib": "1.8.1", - "tsutils": "2.15.0" + "tsutils": "2.16.0" } }, "tsutils": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.15.0.tgz", - "integrity": "sha512-kKb1mSqRMwF0GHKya5/hZsI2m7Flg4ONZDeYu4e6Gx+kYAu86zsLNCHcUmNWhCRaUcKshNI272hOzuaCQDzJ2g==", + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.16.0.tgz", + "integrity": "sha512-9Ier/60O7OZRNPiw+or5QAtAY4kQA+WDiO/r6xOYATEyefH9bdfvTRLCxrYnFhQlZfET2vYXKfpr3Vw2BiArZw==", "dev": true, "requires": { "tslib": "1.8.1" @@ -9537,7 +9537,7 @@ "integrity": "sha512-23qmtiLm1X7O0XVSZ54W7XGHykPss+2lo3RYC9zSzK3DDT5W27woZpDFDKguDCnG1RIX8cDnmy5j+dtXxJCA/Q==", "dev": true, "requires": { - "cacache": "10.0.1", + "cacache": "10.0.2", "find-cache-dir": "1.0.0", "schema-utils": "0.3.0", "source-map": "0.5.7", diff --git a/packages/demos/angular/src/app/nav/pages/page-three.ts b/packages/demos/angular/src/app/nav/pages/page-three.ts index ffca811b68..c36e8cba5b 100644 --- a/packages/demos/angular/src/app/nav/pages/page-three.ts +++ b/packages/demos/angular/src/app/nav/pages/page-three.ts @@ -3,24 +3,22 @@ import { Component } from '@angular/core'; @Component({ selector: 'page-three', template: ` - - - - Page Three - - - - Page Three -
- Go Back -
- -
-
+ + + Page Three + + + + Page Three +
+ Go Back +
+ +
` }) export class PageThree { diff --git a/packages/demos/angular/src/app/nav/pages/page-two.ts b/packages/demos/angular/src/app/nav/pages/page-two.ts index 8ccdb35c0f..24ed2e6ed7 100644 --- a/packages/demos/angular/src/app/nav/pages/page-two.ts +++ b/packages/demos/angular/src/app/nav/pages/page-two.ts @@ -5,27 +5,25 @@ import { PageThree } from './page-three'; @Component({ selector: 'page-two', template: ` - - - - Page Two - - - - Page Two -
- Go to Page Three -
-
- Go Back + + + Page Two + + + + Page Two +
+ Go to Page Three
-
    -
  • ngOnInit - {{ngOnInitDetection}}
  • -
  • ionViewWillEnter - {{ionViewWillEnterDetection}}
  • -
  • ionViewDidEnter - {{ionViewDidEnterDetection}}
  • -
-
- +
+ Go Back +
+
    +
  • ngOnInit - {{ngOnInitDetection}}
  • +
  • ionViewWillEnter - {{ionViewWillEnterDetection}}
  • +
  • ionViewDidEnter - {{ionViewDidEnterDetection}}
  • +
+ ` }) export class PageTwo {