From 0c3d1bf93d261eba345e48bb112978ce0ab23855 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Mon, 25 Nov 2013 17:01:06 -0600
Subject: [PATCH] Fixed #166

---
 dist/js/ionic-angular.js                       | 14 +++++++-------
 js/ext/angular/src/directive/ionicNavRouter.js | 14 +++++++-------
 js/ext/angular/test/navRouter.html             |  6 +++++-
 scss/_platform.scss                            |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 530527183a..e7e7cd991c 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -1429,10 +1429,12 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
           return;
         }
 
-        if(back) {
-          reverseTransition();
-        } else {
-          forwardTransition();
+        if($rootScope.stackCursorPosition > 0) {
+          if(back) {
+            reverseTransition();
+          } else {
+            forwardTransition();
+          }
         }
       });
 
@@ -1450,7 +1452,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
       $scope.$watch(function () { return $location.path() }, function (newLocation, oldLocation) {
         if($rootScope.actualLocation === newLocation) {
 
-          if(oldLocation == '' && newLocation == '/') {
+          if(oldLocation == '' || newLocation == '/') {
             // initial route, skip this
             return;
           }
@@ -1580,8 +1582,6 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
       $element.addClass($scope.type);
 
       var updateHeaderData = function(data) {
-        console.log('Header data changed', data);
-
         var oldTitle = $scope.currentTitle;
         $scope.oldTitle = oldTitle;
 
diff --git a/js/ext/angular/src/directive/ionicNavRouter.js b/js/ext/angular/src/directive/ionicNavRouter.js
index 5004368a27..6db1db4fa6 100644
--- a/js/ext/angular/src/directive/ionicNavRouter.js
+++ b/js/ext/angular/src/directive/ionicNavRouter.js
@@ -71,10 +71,12 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
           return;
         }
 
-        if(back) {
-          reverseTransition();
-        } else {
-          forwardTransition();
+        if($rootScope.stackCursorPosition > 0) {
+          if(back) {
+            reverseTransition();
+          } else {
+            forwardTransition();
+          }
         }
       });
 
@@ -92,7 +94,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
       $scope.$watch(function () { return $location.path() }, function (newLocation, oldLocation) {
         if($rootScope.actualLocation === newLocation) {
 
-          if(oldLocation == '' && newLocation == '/') {
+          if(oldLocation == '' || newLocation == '/') {
             // initial route, skip this
             return;
           }
@@ -222,8 +224,6 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
       $element.addClass($scope.type);
 
       var updateHeaderData = function(data) {
-        console.log('Header data changed', data);
-
         var oldTitle = $scope.currentTitle;
         $scope.oldTitle = oldTitle;
 
diff --git a/js/ext/angular/test/navRouter.html b/js/ext/angular/test/navRouter.html
index bd683af856..6d9360a644 100644
--- a/js/ext/angular/test/navRouter.html
+++ b/js/ext/angular/test/navRouter.html
@@ -46,7 +46,7 @@
 
 
       .config(function($routeProvider, $locationProvider) {
-        $routeProvider.when('/', {
+        $routeProvider.when('/cats', {
           templateUrl: 'page1.html',
           controller: 'Page1Ctrl'
         });
@@ -59,6 +59,10 @@
           templateUrl: 'page3.html',
         });
 
+        $routeProvider.otherwise({
+          redirectTo: '/cats'
+        });
+
         // configure html5 to get links working on jsfiddle
         //$locationProvider.html5Mode(true);
 
diff --git a/scss/_platform.scss b/scss/_platform.scss
index a8767af9d2..1fcc3a3a7b 100644
--- a/scss/_platform.scss
+++ b/scss/_platform.scss
@@ -24,4 +24,4 @@
   .has-subheader {
     top: 108px;
   }
-}
\ No newline at end of file
+}