From 99214b403639639bb94304172b995f427d820a45 Mon Sep 17 00:00:00 2001
From: Nick Wientge <nick@exygeninteractive.com>
Date: Fri, 2 Jan 2015 15:50:00 -0800
Subject: [PATCH] dont run route animations when changing tabs

---
 components/ionNavBar/ionNavBar.js   |  4 ++--
 components/ionNavView/ionNavView.js |  8 ++++++--
 components/ionTab/ionTab.html       |  4 ++--
 components/ionTab/ionTab.js         | 18 ++++++++++++++++++
 components/ionView/ionView.js       |  5 +++++
 package.js                          |  1 +
 6 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/components/ionNavBar/ionNavBar.js b/components/ionNavBar/ionNavBar.js
index a98c55a..c0d6563 100644
--- a/components/ionNavBar/ionNavBar.js
+++ b/components/ionNavBar/ionNavBar.js
@@ -28,7 +28,7 @@ Template.ionNavBar.rendered = function () {
     insertElement: function(node, next) {
       var $node = $(node);
 
-      if (!$node.hasClass('title') && !$node.hasClass('button')) {
+      if (!$node.hasClass('title') && !$node.hasClass('button') || IonNavigation.skipTransitions) {
         $node.insertBefore(next);
         return;
       }
@@ -63,7 +63,7 @@ Template.ionNavBar.rendered = function () {
 
     removeElement: function(node) {
       var $node = $(node);
-      if (!$node.hasClass('title') && !$node.hasClass('button')) {
+      if (!$node.hasClass('title') && !$node.hasClass('button') || IonNavigation.skipTransitions) {
         $node.remove();
         return;
       }
diff --git a/components/ionNavView/ionNavView.js b/components/ionNavView/ionNavView.js
index 38706bb..a6da0c8 100644
--- a/components/ionNavView/ionNavView.js
+++ b/components/ionNavView/ionNavView.js
@@ -1,3 +1,7 @@
+IonNavigation = {
+  skipTransitions: false
+};
+
 Template.ionNavView.created = function () {
   Session.setDefault('ionNavDirection', 'forward');
 
@@ -25,7 +29,7 @@ Template.ionNavView.rendered = function () {
   this.find('[data-nav-container]')._uihooks = {
     insertElement: function(node, next) {
       var $node = $(node);
-      if (!template.transition || !$node.hasClass('view')) {
+      if (!template.transition || !$node.hasClass('view') || IonNavigation.skipTransitions) {
         $node.insertBefore(next);
         return;
       }
@@ -43,7 +47,7 @@ Template.ionNavView.rendered = function () {
 
     removeElement: function(node) {
       var $node = $(node);
-      if (!template.transition || !$node.hasClass('view')) {
+      if (!template.transition || !$node.hasClass('view') || IonNavigation.skipTransitions) {
         $node.remove();
         return;
       }
diff --git a/components/ionTab/ionTab.html b/components/ionTab/ionTab.html
index 8f2419c..66fa04a 100644
--- a/components/ionTab/ionTab.html
+++ b/components/ionTab/ionTab.html
@@ -1,6 +1,6 @@
 <template name="ionTab">
-  <a class="tab-item tab-item-positive {{isActiveRoute regex=path}}" href="{{url}}">
-    {{#if isActiveRoute regex=path }}
+  <a class="tab-item tab-item-positive {{isActive}}" href="{{url}}" data-ion-tab>
+    {{#if isActive}}
       {{> ionIcon icon=activeIcon}}
     {{else}}
       {{> ionIcon icon=defaultIcon}}
diff --git a/components/ionTab/ionTab.js b/components/ionTab/ionTab.js
index 3b9101f..ffd6b3a 100644
--- a/components/ionTab/ionTab.js
+++ b/components/ionTab/ionTab.js
@@ -1,3 +1,15 @@
+Template.ionTab.events({
+  'click': function (event, template) {
+    if (template.data.path) {
+      Session.set('currentTab', template.data.path);
+    }
+
+    // If the tab's content is being rendered inside of a ionNavView
+    // we don't want to slide it in when switching tabs
+    IonNavigation.skipTransitions = true;
+  }
+});
+
 Template.ionTab.helpers({
   url: function () {
     if (this.href) {
@@ -9,6 +21,12 @@ Template.ionTab.helpers({
     }
   },
 
+  isActive: function () {
+    if (this.path && this.path === Session.get('currentTab')) {
+      return 'active';
+    }
+  },
+
   activeIcon: function () {
     if (this.iconOn) {
       return this.iconOn;
diff --git a/components/ionView/ionView.js b/components/ionView/ionView.js
index 36d30bc..33408c7 100644
--- a/components/ionView/ionView.js
+++ b/components/ionView/ionView.js
@@ -1,3 +1,8 @@
+Template.ionView.rendered = function () {
+  // Reset our transition preference
+  IonNavigation.skipTransitions = false;
+};
+
 Template.ionView.helpers({
   classes: function () {
     var classes = ['view'];
diff --git a/package.js b/package.js
index e7a4f32..bca0b9b 100644
--- a/package.js
+++ b/package.js
@@ -101,6 +101,7 @@ Package.onUse(function(api) {
   api.export("IonHeaderBar");
   api.export("IonLoading");
   api.export("IonModal");
+  api.export("IonNavigation");
   api.export("IonPopover");
   api.export("IonPopup");
   api.export("IonSideMenu");