From 52bf1f8520d46fdb5a97d58b715e1e07e67746b4 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 29 Sep 2015 11:45:44 -0500
Subject: [PATCH] fix(menuClose): put in ionic directives

---
 ionic/components.ts                  |  1 +
 ionic/components/menu/menu-close.ts  |  8 +++-----
 ionic/components/menu/menu-toggle.ts |  6 ++----
 ionic/components/nav/nav-push.ts     | 13 +++++++------
 ionic/config/decorators.ts           |  8 ++++++--
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/ionic/components.ts b/ionic/components.ts
index 75e295add6..0e4346cb04 100644
--- a/ionic/components.ts
+++ b/ionic/components.ts
@@ -13,6 +13,7 @@ export * from 'ionic/components/item/item-group'
 export * from 'ionic/components/menu/menu'
 export * from 'ionic/components/menu/menu-types'
 export * from 'ionic/components/menu/menu-toggle'
+export * from 'ionic/components/menu/menu-close'
 export * from 'ionic/components/text-input/text-input'
 export * from 'ionic/components/text-input/label'
 export * from 'ionic/components/list/list'
diff --git a/ionic/components/menu/menu-close.ts b/ionic/components/menu/menu-close.ts
index 0eb1fc9269..f3c1ee4456 100644
--- a/ionic/components/menu/menu-close.ts
+++ b/ionic/components/menu/menu-close.ts
@@ -13,10 +13,10 @@ import {IonicApp} from '../app/app';
     'menuClose'
   ],
   host: {
-    '(click)': 'close($event)'
+    '(click)': 'close()'
   }
 })
-export class MenuToggle extends Ion {
+export class MenuClose extends Ion {
 
   constructor(
     app: IonicApp,
@@ -26,11 +26,9 @@ export class MenuToggle extends Ion {
     this.app = app;
   }
 
-  close(ev) {
+  close() {
     let menu = this.app.getComponent(this.menuClose || 'menu');
     menu && menu.close();
-    ev.preventDefault();
-    ev.stopPropagation();
   }
 
 }
diff --git a/ionic/components/menu/menu-toggle.ts b/ionic/components/menu/menu-toggle.ts
index d476d1c518..07f702dab7 100644
--- a/ionic/components/menu/menu-toggle.ts
+++ b/ionic/components/menu/menu-toggle.ts
@@ -15,7 +15,7 @@ import {Navbar} from '../nav-bar/nav-bar';
     'menuToggle'
   ],
   host: {
-    '(click)': 'toggle($event)',
+    '(click)': 'toggle()',
     '[hidden]': 'isHidden'
   }
 })
@@ -37,11 +37,9 @@ export class MenuToggle extends Ion {
   * TODO
   * @param {TODO} event  TODO
   */
-  toggle(ev) {
+  toggle() {
     let menu = this.app.getComponent(this.menuToggle || 'menu');
     menu && menu.toggle();
-    ev.preventDefault();
-    ev.stopPropagation();
   }
 
   get isHidden() {
diff --git a/ionic/components/nav/nav-push.ts b/ionic/components/nav/nav-push.ts
index 2646ff3004..2db638c4b1 100644
--- a/ionic/components/nav/nav-push.ts
+++ b/ionic/components/nav/nav-push.ts
@@ -12,7 +12,7 @@ import {NavRegistry} from './nav-registry';
     'params: navParams'
   ],
   host: {
-    '(click)': 'onClick($event)',
+    '(click)': 'onClick()',
     'role': 'link'
   }
 })
@@ -26,7 +26,7 @@ export class NavPush {
     this.registry = registry;
   }
 
-  onClick(event) {
+  onClick() {
     let destination, params;
 
     if (this.instruction instanceof Array) {
@@ -44,17 +44,18 @@ export class NavPush {
       destination = this.registry.get(destination);
     }
 
-    this.nav.push(destination, params);
+    this.nav && this.nav.push(destination, params);
   }
 }
 
+
 /**
  * TODO
  */
 @Directive({
   selector: '[nav-pop]',
   host: {
-    '(click)': 'onClick($event)',
+    '(click)': 'onClick()',
     'role': 'link'
   }
 })
@@ -66,7 +67,7 @@ export class NavPop {
   constructor(nav: NavController) {
     this.nav = nav;
   }
-  onClick(event) {
-    this.nav.pop();
+  onClick() {
+    this.nav && this.nav.pop();
   }
 }
diff --git a/ionic/config/decorators.ts b/ionic/config/decorators.ts
index 0b28b96fcb..b4619ea7e4 100644
--- a/ionic/config/decorators.ts
+++ b/ionic/config/decorators.ts
@@ -4,7 +4,8 @@ import * as util from 'ionic/util';
 import {IonicConfig} from './config';
 import {ionicBootstrap} from '../components/app/app';
 import {
-  Menu, MenuToggle, Button, Content, Scroll, Refresher,
+  Menu, MenuToggle, MenuClose,
+  Button, Content, Scroll, Refresher,
   Slides, Slide, SlideLazy,
   Tabs, Tab,
   Card, List, ListHeader, Item, ItemGroup, ItemGroupTitle,
@@ -14,7 +15,8 @@ import {
   TextInput, TextInputElement, Label,
   Segment, SegmentButton, SegmentControlValueAccessor,
   RadioGroup, RadioButton, SearchBar,
-  Nav, NavbarTemplate, Navbar, NavPush, NavPop, NavRouter,
+  Nav, NavbarTemplate, Navbar,
+  NavPush, NavPop, NavRouter,
   IdRef,
   ShowWhen, HideWhen
 } from '../ionic';
@@ -34,6 +36,7 @@ export const IONIC_DIRECTIVES = [
   // Content
   forwardRef(() => Menu),
   forwardRef(() => MenuToggle),
+  forwardRef(() => MenuClose),
 
   forwardRef(() => Button),
   forwardRef(() => Content),
@@ -81,6 +84,7 @@ export const IONIC_DIRECTIVES = [
   forwardRef(() => Nav),
   forwardRef(() => NavbarTemplate),
   forwardRef(() => Navbar),
+
   forwardRef(() => NavPush),
   forwardRef(() => NavPop),
   forwardRef(() => NavRouter),