From 2cb2a8c4ea77d10ae3ae69da71a66c6428a9b64c Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Mon, 8 Jan 2018 14:07:05 -0600 Subject: [PATCH] refactor(schedule-filter): dismiss the modal --- .../conference-app/angular/package-lock.json | 20 +++++++++---------- .../pages/schedule-filter/schedule-filter.ts | 8 +++----- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/packages/demos/conference-app/angular/package-lock.json b/packages/demos/conference-app/angular/package-lock.json index 4649540fa8..4f74267f8e 100644 --- a/packages/demos/conference-app/angular/package-lock.json +++ b/packages/demos/conference-app/angular/package-lock.json @@ -284,17 +284,17 @@ "integrity": "sha512-i2j2J9KIobCqyX6LlrlYhaHgd7qmP1pzHs4XAthHgth8m6c4gsHsh+Pl3fqknD7AX18ghpqo3tVtv0EFhSFU3w==" }, "@ionic/angular": { - "version": "0.0.2-14", - "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-0.0.2-14.tgz", - "integrity": "sha512-VoyiNplPOeaJn0clFNKllWIy6l2nBXmuU5UZqmTSBS/xDSXtiTwGwCao/uTjxAvorqh/BFsRvPSgWXthN733kQ==", + "version": "0.0.2-15", + "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-0.0.2-15.tgz", + "integrity": "sha512-pk5ylbu8XgHCwCl5lSTaf9QMoZf+TgZ6KGfLU7CUNGc+hol+1NyIQyyA8nxS4Rbm9brxXZT5z3CYb1KHTnbtCg==", "requires": { "@stencil/core": "0.1.1-0" } }, "@ionic/core": { - "version": "0.0.2-33", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.0.2-33.tgz", - "integrity": "sha512-0bzDrY9GeZhFXVZ6N+ZnXAdxrvJX4v3wZbmxNp7j7g8KED7bOVwwLBovLZ6Brz8W/AX2J/T+PI/PseBCaIaGVw==" + "version": "0.0.2-36", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.0.2-36.tgz", + "integrity": "sha512-pKzFN8elEPsOaugopar148GM4E88tzd3Q523XEyhOUsUP4NKD+B0bpro3OwDmvLlv6U7z0lrz9jBCs3ZIBeIUA==" }, "@ionic/storage": { "version": "2.1.3", @@ -6807,13 +6807,13 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz", "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", "requires": { - "@types/node": "8.5.7" + "@types/node": "9.3.0" }, "dependencies": { "@types/node": { - "version": "8.5.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.7.tgz", - "integrity": "sha512-+1ZfzGIq8Y3EV7hPF7bs3i+Gi2mqYOiEGGRxGYPrn+hTYLMmzg+/5TkMkCHiRtLB38XSNvr/43aQ9+cUq4BbBg==" + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz", + "integrity": "sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw==" } } }, diff --git a/packages/demos/conference-app/angular/src/pages/schedule-filter/schedule-filter.ts b/packages/demos/conference-app/angular/src/pages/schedule-filter/schedule-filter.ts index c4437c7438..53243b9ccd 100644 --- a/packages/demos/conference-app/angular/src/pages/schedule-filter/schedule-filter.ts +++ b/packages/demos/conference-app/angular/src/pages/schedule-filter/schedule-filter.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { NavParams } from '@ionic/angular'; +import { ModalController, NavParams } from '@ionic/angular'; import { ConferenceData } from '../../providers/conference-data'; @@ -14,6 +14,7 @@ export class ScheduleFilterPage { constructor( public confData: ConferenceData, + public modalController: ModalController, public navParams: NavParams, ) { // passed in array of track names that should be excluded (unchecked) @@ -45,9 +46,6 @@ export class ScheduleFilterPage { } dismiss(data?: any) { - // using the injected ViewController this page - // can "dismiss" itself and pass back data - // this.viewCtrl.dismiss(data); - alert('todo'); + this.modalController.dismiss(data); } }