From 5d33e312c2f3958f197838ba658ca2b59c04e47a Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Wed, 12 Aug 2015 02:52:58 +0200
Subject: [PATCH 01/15] added popup platform-specific styles + platform
 switcher for browser testing

---
 components/ionBody/ionBody.js     |  9 ++++++++-
 components/ionPopup/ionPopup.html |  4 ++--
 components/ionPopup/ionPopup.js   | 12 +++++++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index 726f802..c951ec0 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -3,10 +3,17 @@ Platform = {
     return (!!navigator.userAgent.match(/iPad/i) || !!navigator.userAgent.match(/iPhone/i) || !!navigator.userAgent.match(/iPod/i))
            || Session.get('platformOverride') === 'iOS';
   },
-
   isAndroid: function () {
     return navigator.userAgent.indexOf('Android') > 0
            || Session.get('platformOverride') === 'Android';
+  },
+  set: function(platform) {
+    if (!_.contains(['android', 'ios', 'web'], platform)) return;
+    var $ionicBody = $('.ionic-body');
+    $ionicBody.removeClass('platform-web platform-cordova platform-ios platform-android');
+    if (platform === 'android') $ionicBody.addClass('platform-cordova platform-android');
+    if (platform === 'ios') $ionicBody.addClass('platform-cordova platform-ios');
+    if (platform === 'web') $ionicBody.addClass('platform-web');
   }
 };
 
diff --git a/components/ionPopup/ionPopup.html b/components/ionPopup/ionPopup.html
index f6aeadf..15e2563 100644
--- a/components/ionPopup/ionPopup.html
+++ b/components/ionPopup/ionPopup.html
@@ -1,7 +1,7 @@
 <template name="ionPopup">
   <div class="backdrop">
     <div class="popup-container">
-      <div class="popup">
+      <div class="popup {{class}}">
         {{#if hasHead}}
           <div class="popup-head">
             {{#if title}}
@@ -18,7 +18,7 @@ <h5 class="popup-sub-title">{{subTitle}}</h5>
           </div>
         {{/if}}
         {{#if buttons.length}}
-          <div class="popup-buttons">
+          <div class="popup-buttons {{#if buttonsVertical}}popup-buttons-vertical{{/if}}">
             {{#each buttons}}
               <button data-action="buttonTapped" data-index="{{index}}"
               class="button {{type}}">
diff --git a/components/ionPopup/ionPopup.js b/components/ionPopup/ionPopup.js
index 6fb683f..a8275c1 100644
--- a/components/ionPopup/ionPopup.js
+++ b/components/ionPopup/ionPopup.js
@@ -22,9 +22,11 @@ IonPopup = {
     }
 
     var data = {
+      class: options.class || '',
       title: options.title,
       subTitle: options.subTitle,
       buttons: this.buttons,
+      buttonsVertical: _.isBoolean(options.buttonsVertical) ? options.buttonsVertical : false,
       template: innerTemplate
     };
 
@@ -38,11 +40,14 @@ IonPopup = {
   },
 
   alert: function (options) {
+    options = options || {};
     IonPopup.show({
+      class: options.class,
       title: options.title,
       subTitle: options.subTitle,
       template: options.template,
       templateName: options.templateName,
+      buttonsVertical: options.buttonsVertical,
       buttons: [
         {
           text: options.okText ? options.okText : 'Ok',
@@ -57,11 +62,14 @@ IonPopup = {
   },
 
   confirm: function (options) {
+    options = options || {};
     IonPopup.show({
+      class: options.class,
       title: options.title,
       subTitle: options.subTitle,
       template: options.template,
       templateName: options.templateName,
+      buttonsVertical: options.buttonsVertical,
       buttons: [
         {
           text: options.cancelText ? options.cancelText : 'Cancel',
@@ -84,7 +92,7 @@ IonPopup = {
   },
 
   prompt: function (options) {
-
+    options = options || {};
     var template = '';
     if (options.templateName) {
       template = Template[options.templateName].renderFunction().value;
@@ -98,9 +106,11 @@ IonPopup = {
       options.inputPlaceholder + '" name="prompt" >';
 
     IonPopup.show({
+      class: options.class,
       title: options.title,
       subTitle: options.subTitle,
       template: template,
+      buttonsVertical: options.buttonsVertical,
       buttons: [
         {
           text: options.cancelText ? options.cancelText : 'Cancel',

From 7617dbba653f08335cdb06efa8fd03e08c25cc95 Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Wed, 12 Aug 2015 10:05:19 +0200
Subject: [PATCH 02/15] misc

---
 components/ionBody/ionBody.js | 24 ++++++++++++++++++++----
 package.js                    |  3 ++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index c951ec0..3e39252 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -7,13 +7,25 @@ Platform = {
     return navigator.userAgent.indexOf('Android') > 0
            || Session.get('platformOverride') === 'Android';
   },
+  isWeb: function () {
+    return !Platform.isIOS() && !Platform.isAndroid();
+  },
   set: function(platform) {
     if (!_.contains(['android', 'ios', 'web'], platform)) return;
     var $ionicBody = $('.ionic-body');
     $ionicBody.removeClass('platform-web platform-cordova platform-ios platform-android');
-    if (platform === 'android') $ionicBody.addClass('platform-cordova platform-android');
-    if (platform === 'ios') $ionicBody.addClass('platform-cordova platform-ios');
-    if (platform === 'web') $ionicBody.addClass('platform-web');
+    if (platform === 'android') {
+      $ionicBody.addClass('platform-cordova platform-android');
+      Session.set('platformOverride', 'Android');
+    }
+    if (platform === 'ios') {
+      $ionicBody.addClass('platform-cordova platform-ios');
+      Session.set('platformOverride', 'iOS');
+    }
+    if (platform === 'web') {
+      $ionicBody.addClass('platform-web');
+      Session.set('platformOverride', null);
+    }
   }
 };
 
@@ -25,6 +37,10 @@ Template.registerHelper('isAndroid', function () {
   return Platform.isAndroid();
 });
 
+Template.registerHelper('isWeb', function () {
+  return Platform.isWeb();
+});
+
 Template.ionBody.helpers({
   platformClasses: function () {
     var classes = ['grade-a'];
@@ -54,7 +70,7 @@ Template.ionBody.rendered = function () {
   });
 };
 
-Template.ionBody.events({
+Template.body.events({
   'click [data-ion-modal]': function (event, template) {
     var templateName = $(event.currentTarget).data('ion-modal');
     IonModal.open(templateName, $(event.currentTarget).data());
diff --git a/package.js b/package.js
index 237409b..3d4116c 100644
--- a/package.js
+++ b/package.js
@@ -18,7 +18,8 @@ Package.onUse(function(api) {
     "iron:router@1.0.0",
     "tracker",
     "session",
-    "jquery"
+    "jquery",
+    "gwendall:body-events",
   ], "client");
 
   api.addFiles([

From 637b0a70b15e6f056abc5525a31ee99366a405c3 Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Wed, 12 Aug 2015 17:20:43 +0200
Subject: [PATCH 03/15] cleanup + fix popovers + misc

---
 components/ionBody/ionBody.js           | 138 ++++++++++++------------
 components/ionHeaderBar/ionHeaderBar.js |  29 +++--
 components/ionPopover/ionPopover.js     |  37 ++++---
 3 files changed, 109 insertions(+), 95 deletions(-)

diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index 3e39252..abc42da 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -11,20 +11,77 @@ Platform = {
     return !Platform.isIOS() && !Platform.isAndroid();
   },
   set: function(platform) {
-    if (!_.contains(['android', 'ios', 'web'], platform)) return;
-    var $ionicBody = $('.ionic-body');
-    $ionicBody.removeClass('platform-web platform-cordova platform-ios platform-android');
-    if (platform === 'android') {
-      $ionicBody.addClass('platform-cordova platform-android');
-      Session.set('platformOverride', 'Android');
-    }
-    if (platform === 'ios') {
-      $ionicBody.addClass('platform-cordova platform-ios');
-      Session.set('platformOverride', 'iOS');
-    }
-    if (platform === 'web') {
-      $ionicBody.addClass('platform-web');
-      Session.set('platformOverride', null);
+    setTimeout(function() {
+      if (!_.contains(['android', 'ios', 'web'], platform)) return;
+      var $ionicBody = $('.ionic-body');
+      $ionicBody.removeClass('platform-web platform-cordova platform-ios platform-android');
+      if (platform === 'android') {
+        $ionicBody.addClass('platform-cordova platform-android');
+        Session.set('platformOverride', 'Android');
+      }
+      if (platform === 'ios') {
+        $ionicBody.addClass('platform-cordova platform-ios');
+        Session.set('platformOverride', 'iOS');
+      }
+      if (platform === 'web') {
+        $ionicBody.addClass('platform-web');
+        Session.set('platformOverride', null);
+      }
+    }, 10);
+  },
+  get: function() {
+    return (Session.get('platformOverride') || '').toLowerCase();
+  },
+  events: {
+    'click [data-ion-modal]': function (event, template) {
+      var templateName = $(event.currentTarget).data('ion-modal');
+      IonModal.open(templateName, $(event.currentTarget).data());
+    },
+
+    'click [data-ion-popover]': function (event, template) {
+      var templateName = $(event.currentTarget).data('ion-popover');
+      IonPopover.show(templateName, $(event.currentTarget).data(), event.currentTarget);
+    },
+
+    'click [data-nav-direction]': function (event, template) {
+      $('[data-nav-container]').addClass('nav-view-direction-' + $(event.target).data('nav-direction'));
+      $('[data-navbar-container]').addClass('nav-bar-direction-' + $(event.target).data('nav-direction'));
+    },
+
+    'click [data-ion-menu-toggle]': function (event, template) {
+      if (!IonSideMenu.snapper) {
+        return;
+      }
+
+      var direction;
+      var $el = $(event.target);
+
+      if ($el.data('ion-menu-toggle') !== '') {
+        direction = $el.data('ion-menu-toggle');
+      } else {
+        direction = 'left';
+      }
+
+      if(IonSideMenu.snapper.state().state === direction){
+        IonSideMenu.snapper.close();
+      } else {
+        IonSideMenu.snapper.open(direction);
+      }
+    },
+
+    'click [data-ion-menu-close]': function (event, template) {
+      if (!IonSideMenu.snapper) {
+        return;
+      }
+      IonSideMenu.snapper.close();
+    },
+
+    'mousedown .button, touchstart .button': function (event, template) {
+      $(event.target).addClass('active');
+    },
+
+    'mouseup .button, touchend .button': function (event, template) {
+      $(event.target).removeClass('active');
     }
   }
 };
@@ -70,55 +127,4 @@ Template.ionBody.rendered = function () {
   });
 };
 
-Template.body.events({
-  'click [data-ion-modal]': function (event, template) {
-    var templateName = $(event.currentTarget).data('ion-modal');
-    IonModal.open(templateName, $(event.currentTarget).data());
-  },
-
-  'click [data-ion-popover]': function (event, template) {
-    var templateName = $(event.currentTarget).data('ion-popover');
-    IonPopover.show(templateName, $(event.currentTarget).data(), event.currentTarget);
-  },
-
-  'click [data-nav-direction]': function (event, template) {
-    $('[data-nav-container]').addClass('nav-view-direction-' + $(event.target).data('nav-direction'));
-    $('[data-navbar-container]').addClass('nav-bar-direction-' + $(event.target).data('nav-direction'));
-  },
-
-  'click [data-ion-menu-toggle]': function (event, template) {
-    if (!IonSideMenu.snapper) {
-      return;
-    }
-
-    var direction;
-    var $el = $(event.target);
-
-    if ($el.data('ion-menu-toggle') !== '') {
-      direction = $el.data('ion-menu-toggle');
-    } else {
-      direction = 'left';
-    }
-
-    if(IonSideMenu.snapper.state().state === direction){
-      IonSideMenu.snapper.close();
-    } else {
-      IonSideMenu.snapper.open(direction);
-    }
-  },
-
-  'click [data-ion-menu-close]': function (event, template) {
-    if (!IonSideMenu.snapper) {
-      return;
-    }
-    IonSideMenu.snapper.close();
-  },
-
-  'mousedown .button, touchstart .button': function (event, template) {
-    $(event.target).addClass('active');
-  },
-
-  'mouseup .button, touchend .button': function (event, template) {
-    $(event.target).removeClass('active');
-  }
-});
+Template.ionBody.events(Platform.events);
diff --git a/components/ionHeaderBar/ionHeaderBar.js b/components/ionHeaderBar/ionHeaderBar.js
index ddd7263..28f79ce 100644
--- a/components/ionHeaderBar/ionHeaderBar.js
+++ b/components/ionHeaderBar/ionHeaderBar.js
@@ -1,26 +1,23 @@
 IonHeaderBar = {
   alignTitle: function () {
-    var align = this.alignTitle || 'center';
-    var $title = this.$('.title');
 
-    if (Platform.isAndroid() && !this.alignTitle) {
-      $title.addClass('title-left');
-      return;
-    }
+    var platform = Platform.get();
+    var platformAligns = {
+      android: 'left',
+      ios: 'center'
+    };
+    var align = this.alignTitle || platformAligns[platform] || 'center';
+    var titleClass = 'title-' + align;
+
+    var $title = this.$('.title');
+    $title.removeClass('title-left title-center title-right').addClass(titleClass);
 
-    if (align === 'center') {
-      $title.addClass('title-center');
-    } else if (align === 'left') {
-      $title.addClass('title-left');
-    } else if (align === 'right') {
-      $title.addClass('title-right');
-    }
   },
 
   positionTitle: function () {
     var $title = this.$('.title');
-    var $leftButton = $('.button.pull-left');
-    var $rightButton = $('.button.pull-right');
+    var $leftButton = this.$('.button.pull-left');
+    var $rightButton = this.$('.button.pull-right');
 
     // Find out which button is wider,
     // use that to offset the title on both sides
@@ -62,13 +59,11 @@ Template.ionHeaderBar.destroyed = function () {
 Template.ionHeaderBar.helpers({
   classes: function () {
     var classes = ['bar', 'bar-header'];
-
     if (this.class) {
       classes.push(this.class);
     } else {
       classes.push('bar-stable');
     }
-
     return classes.join(' ');
   }
 });
diff --git a/components/ionPopover/ionPopover.js b/components/ionPopover/ionPopover.js
index b8141ea..d244c41 100644
--- a/components/ionPopover/ionPopover.js
+++ b/components/ionPopover/ionPopover.js
@@ -7,42 +7,55 @@ IonPopover = {
 
     var $backdrop = $(this.view.firstNode());
     var $popover = $backdrop.find('.popover');
-    var $button = $(button);
     var $arrow = $backdrop.find('.popover-arrow');
+    var $body = $('.ionic-body').width() ? $('.ionic-body') : $('body');
+    var $button = $(button);
 
-    var bodyWidth = $('body').width();
-    var bodyHeight = $(window).innerHeight;
+    var bodyWidth = $body.outerWidth();
+    var bodyHeight = $body.outerHeight;
+    var bodyPosition = $body.offset();
     var buttonPosition = $button.offset();
     var buttonWidth = $button.outerWidth();
     var buttonHeight = $button.outerHeight();
     var popoverWidth = $popover.outerWidth();
     var popoverHeight = $popover.outerHeight();
+    var arrowWidth = $arrow.outerWidth();
 
     var popoverCSS = {
       marginLeft: '0',
       opacity: 1,
-      left: buttonPosition.left + buttonWidth / 2 - popoverWidth / 2
+      left: buttonPosition.left + buttonWidth / 2 - popoverWidth / 2,
+      maxWidth: bodyWidth - POPOVER_BODY_PADDING * 2
     };
 
-    if (popoverCSS.left < POPOVER_BODY_PADDING) {
+    var overflowsOnLeft = popoverCSS.left < POPOVER_BODY_PADDING;
+    if (overflowsOnLeft) {
       popoverCSS.left = POPOVER_BODY_PADDING;
-    } else if(popoverCSS.left + popoverWidth + POPOVER_BODY_PADDING > bodyWidth) {
+    }
+
+    var overflowsOnRight = popoverCSS.left + popoverWidth + POPOVER_BODY_PADDING * 2 > bodyWidth;
+    if (overflowsOnRight) {
       popoverCSS.left = bodyWidth - popoverWidth - POPOVER_BODY_PADDING;
     }
 
-    if (buttonPosition.top + buttonHeight + popoverHeight > bodyHeight) {
-      popoverCSS.top = buttonPosition.top - popoverHeight;
+    var shouldBeBelowButton = buttonPosition.top + buttonHeight + popoverHeight > bodyHeight;
+    if (shouldBeBelowButton) {
+      popoverCSS.top = buttonPosition.top - bodyPosition.top - popoverHeight;
       $popover.addClass('popover-bottom');
     } else {
-      popoverCSS.top = buttonPosition.top + buttonHeight;
+      popoverCSS.top = buttonPosition.top - bodyPosition.top + buttonHeight;
       $popover.removeClass('popover-bottom');
     }
 
+    var buttonRelativeCenter = buttonPosition.left - bodyPosition.left + buttonWidth / 2;
+    var arrowCSS = {
+      left: buttonRelativeCenter - arrowWidth / 2 - POPOVER_BODY_PADDING + 'px'
+    };
+
     $backdrop.addClass('active');
-    $arrow.css({
-      left: buttonPosition.left + buttonWidth / 2 - $arrow.outerWidth() / 2 - popoverCSS.left + 'px'
-    });
     $popover.css(popoverCSS);
+    $arrow.css(arrowCSS);
+
   },
 
   hide: function () {

From 2ccdb3a9f722797eb01cbe10f7652367aad5ee3d Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Thu, 13 Aug 2015 10:29:15 +0200
Subject: [PATCH 04/15] misc

---
 components/ionHeaderBar/ionHeaderBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ionHeaderBar/ionHeaderBar.js b/components/ionHeaderBar/ionHeaderBar.js
index 28f79ce..5e50513 100644
--- a/components/ionHeaderBar/ionHeaderBar.js
+++ b/components/ionHeaderBar/ionHeaderBar.js
@@ -6,7 +6,7 @@ IonHeaderBar = {
       android: 'left',
       ios: 'center'
     };
-    var align = this.alignTitle || platformAligns[platform] || 'center';
+    var align = this.data.alignTitle || platformAligns[platform] || 'center';
     var titleClass = 'title-' + align;
 
     var $title = this.$('.title');

From bbbb541d350dc0abb88928c0d0053c507668341a Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Thu, 13 Aug 2015 10:31:21 +0200
Subject: [PATCH 05/15] version bump

---
 package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.js b/package.js
index 3d4116c..273e971 100644
--- a/package.js
+++ b/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "meteoric:ionic",
   summary: "Ionic components for Meteor. No Angular!",
-  version: "0.1.17",
+  version: "0.1.18",
   git: "https://github.com/meteoric/meteor-ionic.git"
 });
 

From 564327a1bf62acfa5e0e485f2327d2c806a0e107 Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Thu, 13 Aug 2015 11:04:05 +0200
Subject: [PATCH 06/15] cleanup

---
 components/ionBody/ionBody.js | 105 +++++++++++++++++-----------------
 package.js                    |   3 +-
 2 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index abc42da..e7f90c8 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -31,58 +31,6 @@ Platform = {
   },
   get: function() {
     return (Session.get('platformOverride') || '').toLowerCase();
-  },
-  events: {
-    'click [data-ion-modal]': function (event, template) {
-      var templateName = $(event.currentTarget).data('ion-modal');
-      IonModal.open(templateName, $(event.currentTarget).data());
-    },
-
-    'click [data-ion-popover]': function (event, template) {
-      var templateName = $(event.currentTarget).data('ion-popover');
-      IonPopover.show(templateName, $(event.currentTarget).data(), event.currentTarget);
-    },
-
-    'click [data-nav-direction]': function (event, template) {
-      $('[data-nav-container]').addClass('nav-view-direction-' + $(event.target).data('nav-direction'));
-      $('[data-navbar-container]').addClass('nav-bar-direction-' + $(event.target).data('nav-direction'));
-    },
-
-    'click [data-ion-menu-toggle]': function (event, template) {
-      if (!IonSideMenu.snapper) {
-        return;
-      }
-
-      var direction;
-      var $el = $(event.target);
-
-      if ($el.data('ion-menu-toggle') !== '') {
-        direction = $el.data('ion-menu-toggle');
-      } else {
-        direction = 'left';
-      }
-
-      if(IonSideMenu.snapper.state().state === direction){
-        IonSideMenu.snapper.close();
-      } else {
-        IonSideMenu.snapper.open(direction);
-      }
-    },
-
-    'click [data-ion-menu-close]': function (event, template) {
-      if (!IonSideMenu.snapper) {
-        return;
-      }
-      IonSideMenu.snapper.close();
-    },
-
-    'mousedown .button, touchstart .button': function (event, template) {
-      $(event.target).addClass('active');
-    },
-
-    'mouseup .button, touchend .button': function (event, template) {
-      $(event.target).removeClass('active');
-    }
   }
 };
 
@@ -127,4 +75,55 @@ Template.ionBody.rendered = function () {
   });
 };
 
-Template.ionBody.events(Platform.events);
+Template.ionBody.events({
+  'click [data-ion-modal]': function (event, template) {
+    var templateName = $(event.currentTarget).data('ion-modal');
+    IonModal.open(templateName, $(event.currentTarget).data());
+  },
+
+  'click [data-ion-popover]': function (event, template) {
+    var templateName = $(event.currentTarget).data('ion-popover');
+    IonPopover.show(templateName, $(event.currentTarget).data(), event.currentTarget);
+  },
+
+  'click [data-nav-direction]': function (event, template) {
+    $('[data-nav-container]').addClass('nav-view-direction-' + $(event.target).data('nav-direction'));
+    $('[data-navbar-container]').addClass('nav-bar-direction-' + $(event.target).data('nav-direction'));
+  },
+
+  'click [data-ion-menu-toggle]': function (event, template) {
+    if (!IonSideMenu.snapper) {
+      return;
+    }
+
+    var direction;
+    var $el = $(event.target);
+
+    if ($el.data('ion-menu-toggle') !== '') {
+      direction = $el.data('ion-menu-toggle');
+    } else {
+      direction = 'left';
+    }
+
+    if(IonSideMenu.snapper.state().state === direction){
+      IonSideMenu.snapper.close();
+    } else {
+      IonSideMenu.snapper.open(direction);
+    }
+  },
+
+  'click [data-ion-menu-close]': function (event, template) {
+    if (!IonSideMenu.snapper) {
+      return;
+    }
+    IonSideMenu.snapper.close();
+  },
+
+  'mousedown .button, touchstart .button': function (event, template) {
+    $(event.target).addClass('active');
+  },
+
+  'mouseup .button, touchend .button': function (event, template) {
+    $(event.target).removeClass('active');
+  }
+});
diff --git a/package.js b/package.js
index 273e971..76d581f 100644
--- a/package.js
+++ b/package.js
@@ -18,8 +18,7 @@ Package.onUse(function(api) {
     "iron:router@1.0.0",
     "tracker",
     "session",
-    "jquery",
-    "gwendall:body-events",
+    "jquery"
   ], "client");
 
   api.addFiles([

From 6aab55b92141c578eb460b6ec26dd89074dde757 Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Thu, 13 Aug 2015 11:21:45 +0200
Subject: [PATCH 07/15] cleanup

---
 components/ionBody/ionBody.js       | 29 ++++++++++++-----------------
 components/ionPopover/ionPopover.js |  2 +-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index e7f90c8..5feeba3 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -11,23 +11,18 @@ Platform = {
     return !Platform.isIOS() && !Platform.isAndroid();
   },
   set: function(platform) {
-    setTimeout(function() {
-      if (!_.contains(['android', 'ios', 'web'], platform)) return;
-      var $ionicBody = $('.ionic-body');
-      $ionicBody.removeClass('platform-web platform-cordova platform-ios platform-android');
-      if (platform === 'android') {
-        $ionicBody.addClass('platform-cordova platform-android');
-        Session.set('platformOverride', 'Android');
-      }
-      if (platform === 'ios') {
-        $ionicBody.addClass('platform-cordova platform-ios');
-        Session.set('platformOverride', 'iOS');
-      }
-      if (platform === 'web') {
-        $ionicBody.addClass('platform-web');
-        Session.set('platformOverride', null);
-      }
-    }, 10);
+    if (!_.contains(['android', 'ios', 'web'], platform)) return;
+    var $ionicBody = $('.ionic-body');
+    $ionicBody.removeClass('platform-web platform-cordova platform-ios platform-android');
+    if (platform === 'android') {
+      $ionicBody.addClass('platform-cordova platform-android');
+    }
+    if (platform === 'ios') {
+      $ionicBody.addClass('platform-cordova platform-ios');
+    }
+    if (platform === 'web') {
+      $ionicBody.addClass('platform-web');
+    }
   },
   get: function() {
     return (Session.get('platformOverride') || '').toLowerCase();
diff --git a/components/ionPopover/ionPopover.js b/components/ionPopover/ionPopover.js
index d244c41..5535b10 100644
--- a/components/ionPopover/ionPopover.js
+++ b/components/ionPopover/ionPopover.js
@@ -49,7 +49,7 @@ IonPopover = {
 
     var buttonRelativeCenter = buttonPosition.left - bodyPosition.left + buttonWidth / 2;
     var arrowCSS = {
-      left: buttonRelativeCenter - arrowWidth / 2 - POPOVER_BODY_PADDING + 'px'
+      left: buttonRelativeCenter - arrowWidth / 2 - popoverCSS.left + 'px'
     };
 
     $backdrop.addClass('active');

From 00a57685d85416d799e2f71502ef0f790180226b Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Thu, 13 Aug 2015 11:24:41 +0200
Subject: [PATCH 08/15] cleanup

---
 components/ionBody/ionBody.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index 5feeba3..83498ed 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -25,7 +25,10 @@ Platform = {
     }
   },
   get: function() {
-    return (Session.get('platformOverride') || '').toLowerCase();
+    var $ionicBody = $('.ionic-body');
+    if ($ionicBody.hasClass('platform-ios')) return 'ios';
+    if ($ionicBody.hasClass('platform-android')) return 'android';
+    return 'web';
   }
 };
 

From 4769d5952956d27cfdbd46b480ca4a5485c22d6a Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Thu, 13 Aug 2015 11:27:21 +0200
Subject: [PATCH 09/15] cleanup

---
 components/ionPopover/ionPopover.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ionPopover/ionPopover.js b/components/ionPopover/ionPopover.js
index 5535b10..e0fd5a4 100644
--- a/components/ionPopover/ionPopover.js
+++ b/components/ionPopover/ionPopover.js
@@ -8,7 +8,7 @@ IonPopover = {
     var $backdrop = $(this.view.firstNode());
     var $popover = $backdrop.find('.popover');
     var $arrow = $backdrop.find('.popover-arrow');
-    var $body = $('.ionic-body').width() ? $('.ionic-body') : $('body');
+    var $body = $('.ionic-body').length ? $('.ionic-body') : $('body');
     var $button = $(button);
 
     var bodyWidth = $body.outerWidth();

From 0fe6adff129e3ceae8028d426aa1f892ee21965f Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Thu, 13 Aug 2015 11:28:58 +0200
Subject: [PATCH 10/15] cleanup

---
 components/ionPopover/ionPopover.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ionPopover/ionPopover.js b/components/ionPopover/ionPopover.js
index e0fd5a4..cb68054 100644
--- a/components/ionPopover/ionPopover.js
+++ b/components/ionPopover/ionPopover.js
@@ -12,7 +12,7 @@ IonPopover = {
     var $button = $(button);
 
     var bodyWidth = $body.outerWidth();
-    var bodyHeight = $body.outerHeight;
+    var bodyHeight = $body.outerHeight();
     var bodyPosition = $body.offset();
     var buttonPosition = $button.offset();
     var buttonWidth = $button.outerWidth();

From 9b9874d36859fe1bc17f1dfa9a03cb3a576aba66 Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Thu, 13 Aug 2015 11:52:28 +0200
Subject: [PATCH 11/15] misc

---
 components/ionPopover/ionPopover.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/ionPopover/ionPopover.js b/components/ionPopover/ionPopover.js
index cb68054..5da1f38 100644
--- a/components/ionPopover/ionPopover.js
+++ b/components/ionPopover/ionPopover.js
@@ -11,8 +11,8 @@ IonPopover = {
     var $body = $('.ionic-body').length ? $('.ionic-body') : $('body');
     var $button = $(button);
 
+    var windowHeight = window.innerHeight;
     var bodyWidth = $body.outerWidth();
-    var bodyHeight = $body.outerHeight();
     var bodyPosition = $body.offset();
     var buttonPosition = $button.offset();
     var buttonWidth = $button.outerWidth();
@@ -38,7 +38,7 @@ IonPopover = {
       popoverCSS.left = bodyWidth - popoverWidth - POPOVER_BODY_PADDING;
     }
 
-    var shouldBeBelowButton = buttonPosition.top + buttonHeight + popoverHeight > bodyHeight;
+    var shouldBeBelowButton = buttonPosition.top + buttonHeight + popoverHeight > windowHeight;
     if (shouldBeBelowButton) {
       popoverCSS.top = buttonPosition.top - bodyPosition.top - popoverHeight;
       $popover.addClass('popover-bottom');

From c9e794f7f7e9115b504c611a61f1ea678e740bdb Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Thu, 13 Aug 2015 12:26:32 +0200
Subject: [PATCH 12/15] updated template hooks to onCreated, onRendered,
 onDestroyed

---
 components/ionActionSheet/ionActionSheet.js          |  8 ++++----
 components/ionBody/ionBody.js                        |  4 ++--
 components/ionFooterBar/ionFooterBar.js              |  8 ++++----
 components/ionHeaderBar/ionHeaderBar.js              | 12 ++++++------
 components/ionModal/ionModal.js                      | 12 ++++++------
 components/ionNavBackButton/ionNavBackButton.js      |  8 ++++----
 components/ionNavBar/ionNavBar.js                    | 12 ++++++------
 components/ionNavView/ionNavView.js                  |  8 ++++----
 components/ionPopover/ionPopover.js                  |  8 ++++----
 components/ionPopup/ionPopup.js                      |  8 ++++----
 .../ionSideMenuContainer/ionSideMenuContainer.js     | 12 ++++++------
 components/ionSlideBox/ionSlideBox.js                | 12 ++++++------
 components/ionSubfooterBar/ionSubfooterBar.js        |  8 ++++----
 components/ionSubheaderBar/ionSubheaderBar.js        |  8 ++++----
 components/ionTabs/ionTabs.js                        | 12 ++++++------
 components/ionView/ionView.js                        |  4 ++--
 16 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/components/ionActionSheet/ionActionSheet.js b/components/ionActionSheet/ionActionSheet.js
index e38ee5b..e66f6c8 100644
--- a/components/ionActionSheet/ionActionSheet.js
+++ b/components/ionActionSheet/ionActionSheet.js
@@ -76,17 +76,17 @@ IonActionSheet = {
   }
 };
 
-Template.ionActionSheet.rendered = function () {
+Template.ionActionSheet.onRendered(function () {
   $(window).on('keyup.ionActionSheet', function(event) {
     if (event.which == 27) {
       IonActionSheet.cancel();
     }
   });
-};
+});
 
-Template.ionActionSheet.destroyed = function () {
+Template.ionActionSheet.onDestroyed(function () {
   $(window).off('keyup.ionActionSheet');
-};
+});
 
 Template.ionActionSheet.events({
   // Handle clicking the backdrop
diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index 83498ed..832ed05 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -65,13 +65,13 @@ Template.ionBody.helpers({
   }
 });
 
-Template.ionBody.rendered = function () {
+Template.ionBody.onRendered(function () {
   window.addEventListener('statusTap', function() {
     $('.content.overflow-scroll').animate({
       scrollTop: 0
     }, 500);
   });
-};
+});
 
 Template.ionBody.events({
   'click [data-ion-modal]': function (event, template) {
diff --git a/components/ionFooterBar/ionFooterBar.js b/components/ionFooterBar/ionFooterBar.js
index 0a1c3b8..1a9b8e7 100644
--- a/components/ionFooterBar/ionFooterBar.js
+++ b/components/ionFooterBar/ionFooterBar.js
@@ -1,10 +1,10 @@
-Template.ionFooterBar.rendered = function () {
+Template.ionFooterBar.onRendered(function () {
   Session.set('hasFooter', true);
-};
+});
 
-Template.ionFooterBar.destroyed = function () {
+Template.ionFooterBar.onDestroyed(function () {
   Session.set('hasFooter', false);
-};
+});
 
 Template.ionFooterBar.helpers({
   classes: function () {
diff --git a/components/ionHeaderBar/ionHeaderBar.js b/components/ionHeaderBar/ionHeaderBar.js
index 5e50513..cceb104 100644
--- a/components/ionHeaderBar/ionHeaderBar.js
+++ b/components/ionHeaderBar/ionHeaderBar.js
@@ -42,19 +42,19 @@ IonHeaderBar = {
   }
 };
 
-Template.ionHeaderBar.created = function () {
+Template.ionHeaderBar.onCreated(function () {
   this.data = this.data || {};
-};
+});
 
-Template.ionHeaderBar.rendered = function () {
+Template.ionHeaderBar.onRendered(function () {
   Session.set('hasHeader', true);
   IonHeaderBar.alignTitle.call(this);
   IonHeaderBar.positionTitle.call(this);
-};
+});
 
-Template.ionHeaderBar.destroyed = function () {
+Template.ionHeaderBar.onDestroyed(function () {
   Session.set('hasHeader', false);
-};
+});
 
 Template.ionHeaderBar.helpers({
   classes: function () {
diff --git a/components/ionModal/ionModal.js b/components/ionModal/ionModal.js
index 083bb4d..496c722 100644
--- a/components/ionModal/ionModal.js
+++ b/components/ionModal/ionModal.js
@@ -80,16 +80,16 @@ $(document).delegate('.modal', IonModal.transitionEndEvent, function(e) {
   }
 });
 
-Template.ionModal.created = function () {
+Template.ionModal.onCreated(function () {
   this.data = this.data || {};
   this.customTemplate = this.data.customTemplate || false;
   this.title = this.data.title;
   this.title = this.data.closeText;
   this.focusFirstInput = _.isUndefined(this.data.focusFirstInput) ? true : this.data.focusFirstInput;
   this.animation = this.data.animation || 'slide-in-up';
-};
+});
 
-Template.ionModal.rendered = function () {
+Template.ionModal.onRendered(function () {
   if (this.focusFirstInput) {
     Meteor.setTimeout(function () {
       if (!this._domrange) return;
@@ -102,13 +102,13 @@ Template.ionModal.rendered = function () {
       IonModal.close();
     }
   });
-};
+});
 
-Template.ionModal.destroyed = function () {
+Template.ionModal.onDestroyed(function () {
   if (!IonModal.views.length) {
     $(window).off('keyup.ionModal');
   }
-};
+});
 
 Template.ionModal.helpers({
   barClass: function () {
diff --git a/components/ionNavBackButton/ionNavBackButton.js b/components/ionNavBackButton/ionNavBackButton.js
index 991eb7a..c43a95e 100644
--- a/components/ionNavBackButton/ionNavBackButton.js
+++ b/components/ionNavBackButton/ionNavBackButton.js
@@ -17,11 +17,11 @@ Template.ionNavBackButton.events({
   }
 });
 
-Template.ionNavBackButton.created = function () {
+Template.ionNavBackButton.onCreated(function () {
   this.data = this.data || {};
-};
+});
 
-Template.ionNavBackButton.rendered = function () {
+Template.ionNavBackButton.onRendered(function () {
   this.backUrl = null;
 
   this.data = this.data || {};
@@ -39,7 +39,7 @@ Template.ionNavBackButton.rendered = function () {
     this.backUrl = backRoute.path(Template.parentData(1));
   }
 
-};
+});
 
 Template.ionNavBackButton.helpers({
   classes: function () {
diff --git a/components/ionNavBar/ionNavBar.js b/components/ionNavBar/ionNavBar.js
index ae2de3b..c4edcf0 100644
--- a/components/ionNavBar/ionNavBar.js
+++ b/components/ionNavBar/ionNavBar.js
@@ -1,4 +1,4 @@
-Template.ionNavBar.created = function () {
+Template.ionNavBar.onCreated(function () {
   this.data = this.data || {};
 
   if (Platform.isAndroid()) {
@@ -17,9 +17,9 @@ Template.ionNavBar.created = function () {
   } else {
     this.transitionDuration = 200;
   }
-};
+});
 
-Template.ionNavBar.rendered = function () {
+Template.ionNavBar.onRendered(function () {
   Session.set('hasHeader', true);
 
   IonHeaderBar.alignTitle.call(this);
@@ -89,11 +89,11 @@ Template.ionNavBar.rendered = function () {
       }
     }
   };
-};
+});
 
-Template.ionNavBar.destroyed = function () {
+Template.ionNavBar.onDestroyed(function () {
   Session.set('hasHeader', false);
-};
+});
 
 Template.ionNavBar.helpers({
   classes: function () {
diff --git a/components/ionNavView/ionNavView.js b/components/ionNavView/ionNavView.js
index c54de3c..6f6cd6c 100644
--- a/components/ionNavView/ionNavView.js
+++ b/components/ionNavView/ionNavView.js
@@ -2,7 +2,7 @@ IonNavigation = {
   skipTransitions: false
 };
 
-Template.ionNavView.created = function () {
+Template.ionNavView.onCreated(function () {
   this.data = this.data || {};
   Session.setDefault('ionNavDirection', 'forward');
 
@@ -22,9 +22,9 @@ Template.ionNavView.created = function () {
   } else {
     this.transitionDuration = 320;
   }
-};
+});
 
-Template.ionNavView.rendered = function () {
+Template.ionNavView.onRendered(function () {
   var template = this;
 
   this.find('[data-nav-container]')._uihooks = {
@@ -64,7 +64,7 @@ Template.ionNavView.rendered = function () {
       }, template.transitionDuration);
     }
   };
-};
+});
 
 Template.ionNavView.helpers({
   transition: function () {
diff --git a/components/ionPopover/ionPopover.js b/components/ionPopover/ionPopover.js
index 5da1f38..bb348fa 100644
--- a/components/ionPopover/ionPopover.js
+++ b/components/ionPopover/ionPopover.js
@@ -69,17 +69,17 @@ IonPopover = {
   }
 };
 
-Template.ionPopover.rendered = function () {
+Template.ionPopover.onRendered(function () {
   $(window).on('keyup.ionPopover', function(event) {
     if (event.which == 27) {
       IonPopover.hide();
     }
   });
-};
+});
 
-Template.ionPopover.destroyed = function () {
+Template.ionPopover.onDestroyed(function () {
   $(window).off('keyup.ionPopover');
-};
+});
 
 Template.ionPopover.events({
   // Handle clicking the backdrop
diff --git a/components/ionPopup/ionPopup.js b/components/ionPopup/ionPopup.js
index a8275c1..1b17949 100644
--- a/components/ionPopup/ionPopup.js
+++ b/components/ionPopup/ionPopup.js
@@ -154,17 +154,17 @@ IonPopup = {
   }
 };
 
-Template.ionPopup.rendered = function () {
+Template.ionPopup.onRendered(function () {
   $(window).on('keyup.ionPopup', function(event) {
     if (event.which == 27) {
       IonPopup.close();
     }
   });
-};
+});
 
-Template.ionPopup.destroyed = function () {
+Template.ionPopup.onDestroyed(function () {
   $(window).off('keyup.ionPopup');
-};
+});
 
 Template.ionPopup.events({
   // Handle clicking the backdrop
diff --git a/components/ionSideMenuContainer/ionSideMenuContainer.js b/components/ionSideMenuContainer/ionSideMenuContainer.js
index 618d801..62a79cf 100644
--- a/components/ionSideMenuContainer/ionSideMenuContainer.js
+++ b/components/ionSideMenuContainer/ionSideMenuContainer.js
@@ -2,16 +2,16 @@ IonSideMenu = {
   snapper: null
 };
 
-Template.ionSideMenuContainer.created = function () {
+Template.ionSideMenuContainer.onCreated(function () {
   this.data = this.data || {};
   this.side = this.data.side || 'both';
   this.dragContent = true;
   if (typeof this.data.dragContent != 'undefined') {
     this.dragContent = this.data.dragContent
   }
-};
+});
 
-Template.ionSideMenuContainer.rendered = function () {
+Template.ionSideMenuContainer.onRendered(function () {
   $snapperEl = this.$('.snap-content');
   if (!$snapperEl) {
     return;
@@ -33,8 +33,8 @@ Template.ionSideMenuContainer.rendered = function () {
     disable: disable,
     touchToDrag: this.dragContent
   });
-};
+});
 
-Template.ionSideMenuContainer.destroyed = function () {
+Template.ionSideMenuContainer.onDestroyed(function () {
   IonSideMenu.snapper = null;
-};
+});
diff --git a/components/ionSlideBox/ionSlideBox.js b/components/ionSlideBox/ionSlideBox.js
index 7b7ca82..30cbd08 100644
--- a/components/ionSlideBox/ionSlideBox.js
+++ b/components/ionSlideBox/ionSlideBox.js
@@ -1,13 +1,13 @@
-Template.ionSlideBox.created = function () {
+Template.ionSlideBox.onCreated(function () {
   this.data = this.data || {};
   this.doesContinue = this.data.doesContinue || false;
   this.autoPlay = this.data.autoPlay || false;
   this.slideInterval = this.data.slideInterval || 4000;
   this.showPager = typeof this.data.showPager != 'undefined' ? this.data.showPager : true;
   this.initialSlide = this.data.initialSlide || Session.get('ion-slide-initial-slide') || 0;
-};
+});
 
-Template.ionSlideBox.rendered = function () {
+Template.ionSlideBox.onRendered(function () {
   this.$('.ion-slide-box').slick({
     infinite: this.doesContinue,
     autoplay: this.autoPlay,
@@ -23,9 +23,9 @@ Template.ionSlideBox.rendered = function () {
   this.$('.ion-slide-box').on('afterChange', function (event, slick, currentSlide) {
     $(this).trigger({type: 'onSlideChanged', index: currentSlide});
   });
-};
+});
 
-Template.ionSlideBox.destroyed = function () {
+Template.ionSlideBox.onDestroyed(function () {
   var $slideBox = this.$('.ion-slide-box');
   if ($slideBox.hasClass('slick-initialized')) $slideBox.slick('unslick');
-};
+});
diff --git a/components/ionSubfooterBar/ionSubfooterBar.js b/components/ionSubfooterBar/ionSubfooterBar.js
index 495435d..b78163f 100644
--- a/components/ionSubfooterBar/ionSubfooterBar.js
+++ b/components/ionSubfooterBar/ionSubfooterBar.js
@@ -1,10 +1,10 @@
-Template.ionSubfooterBar.rendered = function () {
+Template.ionSubfooterBar.onRendered(function () {
   Session.set('hasSubfooter', true);
-};
+});
 
-Template.ionSubfooterBar.destroyed = function () {
+Template.ionSubfooterBar.onDestroyed(function () {
   Session.set('hasSubfooter', false);
-};
+});
 
 Template.ionSubfooterBar.helpers({
   classes: function () {
diff --git a/components/ionSubheaderBar/ionSubheaderBar.js b/components/ionSubheaderBar/ionSubheaderBar.js
index 8b66dc9..f20ee80 100644
--- a/components/ionSubheaderBar/ionSubheaderBar.js
+++ b/components/ionSubheaderBar/ionSubheaderBar.js
@@ -1,10 +1,10 @@
-Template.ionSubheaderBar.rendered = function () {
+Template.ionSubheaderBar.onRendered(function () {
   Session.set('hasSubheader', true);
-};
+});
 
-Template.ionSubheaderBar.destroyed = function () {
+Template.ionSubheaderBar.onDestroyed(function () {
   Session.set('hasSubheader', false);
-};
+});
 
 Template.ionSubheaderBar.helpers({
   classes: function () {
diff --git a/components/ionTabs/ionTabs.js b/components/ionTabs/ionTabs.js
index 70a05e9..553c87b 100644
--- a/components/ionTabs/ionTabs.js
+++ b/components/ionTabs/ionTabs.js
@@ -1,8 +1,8 @@
-Template.ionTabs.created = function () {
+Template.ionTabs.onCreated(function () {
   this.data = this.data || {};
-};
+});
 
-Template.ionTabs.rendered = function () {
+Template.ionTabs.onRendered(function () {
   if ((this.data.class && this.data.class === 'tabs-top') || this.data.style === 'android') {
     Session.set('hasTabsTop', true);
   } else {
@@ -16,12 +16,12 @@ Template.ionTabs.rendered = function () {
       Session.set('ionTab.current', href);
     }
   });
-};
+});
 
-Template.ionTabs.destroyed = function () {
+Template.ionTabs.onDestroyed(function () {
   Session.set('hasTabs', false);
   Session.set('hasTabsTop', false);
-};
+});
 
 Template.ionTabs.helpers({
   classes: function () {
diff --git a/components/ionView/ionView.js b/components/ionView/ionView.js
index c4fb182..a853451 100644
--- a/components/ionView/ionView.js
+++ b/components/ionView/ionView.js
@@ -1,4 +1,4 @@
-Template.ionView.rendered = function () {
+Template.ionView.onRendered(function () {
   // Reset our transition preference
   IonNavigation.skipTransitions = false;
 
@@ -8,7 +8,7 @@ Template.ionView.rendered = function () {
     $('.overflow-scroll').scrollTop(IonScrollPositions[routeName]);
     delete IonScrollPositions[routeName];
   }
-};
+});
 
 Template.ionView.helpers({
   classes: function () {

From f3fff4a1f03bd4c34f9f066c48b7f6bdf8f7b18b Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Tue, 18 Aug 2015 14:07:36 +0200
Subject: [PATCH 13/15] misc

---
 components/ionBody/ionBody.js | 11 +++++++++--
 components/ionView/ionView.js |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index 832ed05..c82b255 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -85,8 +85,15 @@ Template.ionBody.events({
   },
 
   'click [data-nav-direction]': function (event, template) {
-    $('[data-nav-container]').addClass('nav-view-direction-' + $(event.target).data('nav-direction'));
-    $('[data-navbar-container]').addClass('nav-bar-direction-' + $(event.target).data('nav-direction'));
+    var direction = $(event.currentTarget).data('nav-direction');
+    $('[data-nav-container]').addClass('nav-view-direction-' + direction);
+    $('[data-navbar-container]').addClass('nav-bar-direction-' + direction);
+    if (!_.contains(['back', 'forward'], direction)) {
+      setTimeout(function() {
+        $('[data-nav-container]').removeClass('nav-view-direction-' + direction);
+        $('[data-navbar-container]').removeClass('nav-bar-direction-' + direction);
+      }, 500);
+    }
   },
 
   'click [data-ion-menu-toggle]': function (event, template) {
diff --git a/components/ionView/ionView.js b/components/ionView/ionView.js
index a853451..060859e 100644
--- a/components/ionView/ionView.js
+++ b/components/ionView/ionView.js
@@ -3,7 +3,8 @@ Template.ionView.onRendered(function () {
   IonNavigation.skipTransitions = false;
 
   // Reset our scroll position
-  var routeName = Router.current().route.getName();
+  var route = Router.current().route;
+  var routeName = route && route.getName();
   if(IonScrollPositions[routeName]) {
     $('.overflow-scroll').scrollTop(IonScrollPositions[routeName]);
     delete IonScrollPositions[routeName];

From 1bb7c0af9ed811874b2024be5e9bbee14a6fd4c7 Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Fri, 28 Aug 2015 12:52:48 +0200
Subject: [PATCH 14/15] misc

---
 components/ionBody/ionBody.js   |  2 +-
 components/ionModal/ionModal.js | 73 +++++++++++++++++++++----------
 components/ionPopup/ionPopup.js | 77 ++++++++++++++++++---------------
 package.js                      |  3 +-
 4 files changed, 94 insertions(+), 61 deletions(-)

diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index c82b255..3f3ca9f 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -73,7 +73,7 @@ Template.ionBody.onRendered(function () {
   });
 });
 
-Template.ionBody.events({
+Template.body.events({
   'click [data-ion-modal]': function (event, template) {
     var templateName = $(event.currentTarget).data('ion-modal');
     IonModal.open(templateName, $(event.currentTarget).data());
diff --git a/components/ionModal/ionModal.js b/components/ionModal/ionModal.js
index 496c722..e793513 100644
--- a/components/ionModal/ionModal.js
+++ b/components/ionModal/ionModal.js
@@ -42,41 +42,66 @@ IonModal = {
       delete this.templateClosed;
 
       var view = (this.view[templateName] || []).slice(-1)[0];
-      if (!view) return;
 
-      var $modalBackdrop = $(view.firstNode());
-      var $modal = $('.modal', $modalBackdrop);
+      if (view) {
+        var $modalBackdrop = $(view.firstNode());
+        var $modal = $('.modal', $modalBackdrop);
+      } else {
+        var $modal = $('.modal');
+        var $modalBackdrop = $modal.parents('.modal-backdrop').get(0);
+      }
 
-      $modal.addClass(this.leaveClasses.join(' '));
-      Meteor.setTimeout(function () {
-        $modal.addClass(this.leaveActiveClass);
-      }.bind(this), 50);
+      if ($modal) {
+        $modal.addClass(this.leaveClasses.join(' '));
+        Meteor.setTimeout(function () {
+          $modal.addClass(this.leaveActiveClass);
+        }.bind(this), 50);
+      }
 
-      $modalBackdrop.fadeOut(500, function() {
-        $('body').removeClass('modal-open');
-      });
+      if ($modalBackdrop) {
+        $modalBackdrop.fadeOut(500, function() {
+          if ($('.modal-backdrop').length) return;
+          $('body').removeClass('modal-open');
+        });
+      }
 
     }.bind(this), 0);
 
   }
 };
 
+var isOpening = function($modal) {
+  return $modal.hasClass(IonModal.enterClasses.join(' ')) || $modal.hasClass(IonModal.enterActiveClasse);
+};
+
+var afterOpen = function($modal) {
+  $modal.removeClass(IonModal.enterClasses.join(' ')).removeClass(IonModal.enterActiveClass);
+  $('body').addClass('modal-open');
+};
+
+var isClosing = function($modal) {
+  return $modal.hasClass(IonModal.leaveClasses.join(' ')) || $modal.hasClass(IonModal.leaveActiveClasse);
+};
+
+var afterClose = function($modal, e) {
+  var firstChild = $modal.children().first();
+  var templateName = getElementModalTemplateName(firstChild);
+  IonModal.views = _.without(IonModal.views, templateName);
+  var view = IonModal.view[templateName].pop();
+  var $modalBackdrop = $(view.firstNode());
+  $modalBackdrop.removeClass('active');
+  $modal.removeClass(IonModal.leaveClasses.join(' ')).removeClass(IonModal.leaveActiveClass).off(IonModal.transitionEndEvent);
+  $('body').removeClass('modal-open');
+  $(e.target).parents('.modal-backdrop').remove();
+  Blaze.remove(view);
+};
+
 $(document).delegate('.modal', IonModal.transitionEndEvent, function(e) {
   var $modal = $(e.currentTarget);
-  if ($modal.hasClass(IonModal.enterClasses.join(' ')) || $modal.hasClass(IonModal.enterActiveClasse)) {
-    $modal.removeClass(IonModal.enterClasses.join(' ')).removeClass(IonModal.enterActiveClass);
-    $('body').addClass('modal-open');
-  } else if ($modal.hasClass(IonModal.leaveClasses.join(' ')) || $modal.hasClass(IonModal.leaveActiveClasse)) {
-    var firstChild = $modal.children().first();
-    var templateName = getElementModalTemplateName(firstChild);
-    IonModal.views = _.without(IonModal.views, templateName);
-    var view = IonModal.view[templateName].pop();
-    var $modalBackdrop = $(view.firstNode());
-    $modalBackdrop.removeClass('active');
-    $modal.removeClass(IonModal.leaveClasses.join(' ')).removeClass(IonModal.leaveActiveClass).off(IonModal.transitionEndEvent);
-    $('body').removeClass('modal-open');
-    $(e.target).parents('.modal-backdrop').remove();
-    Blaze.remove(view);
+  if (isOpening($modal)) {
+    afterOpen($modal);
+  } else if (isClosing($modal)) {
+    afterClose($modal, e);
   }
 });
 
diff --git a/components/ionPopup/ionPopup.js b/components/ionPopup/ionPopup.js
index 1b17949..5516146 100644
--- a/components/ionPopup/ionPopup.js
+++ b/components/ionPopup/ionPopup.js
@@ -1,42 +1,48 @@
 IonPopup = {
   show: function (options) {
-    this.template = Template.ionPopup;
-    this.buttons = [];
-
-    for (var i = 0; i < options.buttons.length; i++) {
-      var button = options.buttons[i];
-      this.buttons.push({
-        text: button.text,
-        type: button.type,
-        index: i,
-        onTap: button.onTap
-      });
-    }
 
-    // Figure out if a template or just a html string was passed
-    var innerTemplate = '';
-    if (options.templateName) {
-      innerTemplate = Template[options.templateName].renderFunction().value;
-    } else if (options.template) {
-      innerTemplate = '<span>' + options.template + '</span>';
-    }
+    setTimeout(function() {
+
+      this.template = Template.ionPopup;
+      this.buttons = [];
+
+      for (var i = 0; i < options.buttons.length; i++) {
+        var button = options.buttons[i];
+        this.buttons.push({
+          text: button.text,
+          type: button.type,
+          index: i,
+          onTap: button.onTap
+        });
+      }
+
+      // Figure out if a template or just a html string was passed
+      var innerTemplate = '';
+      if (options.templateName) {
+        innerTemplate = Template[options.templateName].renderFunction().value;
+      } else if (options.template) {
+        innerTemplate = '<span>' + options.template + '</span>';
+      }
+
+      var data = {
+        class: options.class || '',
+        title: options.title,
+        subTitle: options.subTitle,
+        buttons: this.buttons,
+        buttonsVertical: _.isBoolean(options.buttonsVertical) ? options.buttonsVertical : false,
+        template: innerTemplate
+      };
+
+      this.view = Blaze.renderWithData(this.template, data, $('.ionic-body').get(0));
+      $('body').addClass('popup-open');
+
+      var $backdrop = $(this.view.firstNode());
+      $backdrop.addClass('visible active');
+      var $popup = $backdrop.find('.popup-container');
+      $popup.addClass('popup-showing active');
+
+    }.bind(this), 0);
 
-    var data = {
-      class: options.class || '',
-      title: options.title,
-      subTitle: options.subTitle,
-      buttons: this.buttons,
-      buttonsVertical: _.isBoolean(options.buttonsVertical) ? options.buttonsVertical : false,
-      template: innerTemplate
-    };
-
-    this.view = Blaze.renderWithData(this.template, data, $('.ionic-body').get(0));
-    $('body').addClass('popup-open');
-
-    var $backdrop = $(this.view.firstNode());
-    $backdrop.addClass('visible active');
-    var $popup = $backdrop.find('.popup-container');
-    $popup.addClass('popup-showing active');
   },
 
   alert: function (options) {
@@ -134,6 +140,7 @@ IonPopup = {
   },
 
   close: function () {
+
     var $popup = this._domrange ? $(this.view.firstNode()).find('.popup-container') : $('.popup-container');
     $popup.addClass('popup-hidden').removeClass('active');
 
diff --git a/package.js b/package.js
index 76d581f..273e971 100644
--- a/package.js
+++ b/package.js
@@ -18,7 +18,8 @@ Package.onUse(function(api) {
     "iron:router@1.0.0",
     "tracker",
     "session",
-    "jquery"
+    "jquery",
+    "gwendall:body-events",
   ], "client");
 
   api.addFiles([

From 71d62c307391fbb3c5b17fe4c2b5615026edd9fb Mon Sep 17 00:00:00 2001
From: Gwen <gwendall.esnault@gmail.com>
Date: Fri, 28 Aug 2015 13:08:12 +0200
Subject: [PATCH 15/15] misc

---
 components/ionBody/ionBody.js | 2 +-
 package.js                    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/ionBody/ionBody.js b/components/ionBody/ionBody.js
index 3f3ca9f..c82b255 100644
--- a/components/ionBody/ionBody.js
+++ b/components/ionBody/ionBody.js
@@ -73,7 +73,7 @@ Template.ionBody.onRendered(function () {
   });
 });
 
-Template.body.events({
+Template.ionBody.events({
   'click [data-ion-modal]': function (event, template) {
     var templateName = $(event.currentTarget).data('ion-modal');
     IonModal.open(templateName, $(event.currentTarget).data());
diff --git a/package.js b/package.js
index 273e971..2fcebb6 100644
--- a/package.js
+++ b/package.js
@@ -19,7 +19,6 @@ Package.onUse(function(api) {
     "tracker",
     "session",
     "jquery",
-    "gwendall:body-events",
   ], "client");
 
   api.addFiles([