From 6c63b99e7158209192c9b5095a12eeac55371ab1 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 18 Jun 2015 17:50:12 -0500
Subject: [PATCH] Use contentElement for aside

---
 ionic/components/aside/aside.js            | 10 ++--------
 ionic/components/aside/extensions/types.js |  8 ++++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ionic/components/aside/aside.js b/ionic/components/aside/aside.js
index 01043582a0..a32390bf18 100644
--- a/ionic/components/aside/aside.js
+++ b/ionic/components/aside/aside.js
@@ -41,6 +41,7 @@ export class Aside {
       this.domElement.setAttribute('type', this.type);
 
       console.log('Aside content', this.content);
+      this.contentElement = (this.content instanceof Node) ? this.content : this.content.domElement;
 
       this.config = Aside.config.invoke(this)
       this.gestureDelegate = this.config.getDelegate('gesture');
@@ -53,14 +54,7 @@ export class Aside {
   }
 
   getContentElement() {
-    if(!this.content && !this.content.domElement) {
-      console.error('Aside: make sure to specify a content target using #var on the element');
-      return null;
-    }
-    if(this.content instanceof Node) {
-      return this.content;
-    }
-    return this.content.domElement;
+    return this.contentElement;
   }
 
   setOpenAmt(v) {
diff --git a/ionic/components/aside/extensions/types.js b/ionic/components/aside/extensions/types.js
index a4db80dc9a..1fcd765f98 100644
--- a/ionic/components/aside/extensions/types.js
+++ b/ionic/components/aside/extensions/types.js
@@ -15,15 +15,15 @@ const asideManipulator = {
 }
 const contentManipulator = {
   setSliding(sliding) {
-    this.aside.content.domElement.classList[sliding ? 'add' : 'remove']('no-transition');
+    this.aside.contentElement.classList[sliding ? 'add' : 'remove']('no-transition');
   },
   setOpen(open) {
-    this.aside.content.domElement.classList[open ? 'add' : 'remove'](
+    this.aside.contentElement.classList[open ? 'add' : 'remove'](
       `aside-open-${this.aside.side}`
     )
   },
   setTransform(t) {
-    this.aside.content.domElement.style[CSS.transform] = t;
+    this.aside.contentElement.style[CSS.transform] = t;
   }
 }
 
@@ -33,7 +33,7 @@ export class AsideType {
 
     //FIXME(ajoslin): have to wait for for bindings to apply in a component
     setTimeout(() => {
-      aside.content.domElement.classList.add('aside-content')
+      aside.contentElement.classList.add('aside-content')
     })
   }
 }