From aff9268cc7f03db235c1654a616ccbc7b7746c96 Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Tue, 11 Aug 2015 19:41:26 +0200
Subject: [PATCH] cleanup

---
 components/ionPopup/ionPopup.html | 18 ++++++++-------
 components/ionPopup/ionPopup.js   | 38 ++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/components/ionPopup/ionPopup.html b/components/ionPopup/ionPopup.html
index afc632a..f6aeadf 100644
--- a/components/ionPopup/ionPopup.html
+++ b/components/ionPopup/ionPopup.html
@@ -2,14 +2,16 @@
   <div class="backdrop">
     <div class="popup-container">
       <div class="popup">
-        <div class="popup-head">
-          {{#if title}}
-            <h3 class="popup-title">{{title}}</h3>
-          {{/if}}
-          {{#if subTitle}}
-            <h5 class="popup-sub-title">{{subTitle}}</h5>
-          {{/if}}
-        </div>
+        {{#if hasHead}}
+          <div class="popup-head">
+            {{#if title}}
+              <h3 class="popup-title">{{title}}</h3>
+            {{/if}}
+            {{#if subTitle}}
+              <h5 class="popup-sub-title">{{subTitle}}</h5>
+            {{/if}}
+          </div>
+        {{/if}}
         {{#if template}}
           <div class="popup-body">
             {{{template}}}
diff --git a/components/ionPopup/ionPopup.js b/components/ionPopup/ionPopup.js
index 54bc88a..7db038f 100644
--- a/components/ionPopup/ionPopup.js
+++ b/components/ionPopup/ionPopup.js
@@ -63,14 +63,6 @@ IonPopup = {
       template: options.template,
       templateName: options.templateName,
       buttons: [
-        {
-          text: options.okText ? options.okText : 'Ok',
-          type: options.okType ? options.okType : 'button-positive',
-          onTap: function (event, template) {
-            if (options.onOk) options.onOk(event, template);
-            return true;
-          }
-        },
         {
           text: options.cancelText ? options.cancelText : 'Cancel',
           type: options.cancelType ? options.cancelType : 'button-default',
@@ -78,6 +70,14 @@ IonPopup = {
             if (options.onCancel) options.onCancel(event, template);
             return true;
           }
+        },
+        {
+          text: options.okText ? options.okText : 'Ok',
+          type: options.okType ? options.okType : 'button-positive',
+          onTap: function (event, template) {
+            if (options.onOk) options.onOk(event, template);
+            return true;
+          }
         }
       ]
     });
@@ -100,6 +100,14 @@ IonPopup = {
       subTitle: options.subTitle,
       template: template,
       buttons: [
+        {
+          text: options.cancelText ? options.cancelText : 'Cancel',
+          type: options.cancelType ? options.cancelType : 'button-default',
+          onTap: function (event, template) {
+            if (options.onCancel) options.onCancel(event, template);
+            return true;
+          }
+        },
         {
           text: options.okText ? options.okText : 'Ok',
           type: options.okType ? options.okType : 'button-positive',
@@ -108,14 +116,6 @@ IonPopup = {
             if (options.onOk) options.onOk(event, inputVal);
             return true;
           }
-        },
-        {
-          text: options.cancelText ? options.cancelText : 'Cancel',
-          type: options.cancelType ? options.cancelType : 'button-default',
-          onTap: function (event, template) {
-            if (options.onCancel) options.onCancel(event, template);
-            return true;
-          }
         }
       ]
     });
@@ -168,3 +168,9 @@ Template.ionPopup.events({
   }
 
 });
+
+Template.ionPopup.helpers({
+  hasHead: function() {
+    return this.title || this.subTitle;
+  }
+});