From b91f0096e766f0f8f17554d49193694ccea317c7 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 1 Nov 2013 15:52:04 -0500
Subject: [PATCH] GITHUB!

---
 js/ext/angular/src/directive/ionicNav.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/js/ext/angular/src/directive/ionicNav.js b/js/ext/angular/src/directive/ionicNav.js
index 7a5b5f85f0..5f231c996c 100644
--- a/js/ext/angular/src/directive/ionicNav.js
+++ b/js/ext/angular/src/directive/ionicNav.js
@@ -40,6 +40,7 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
    */
   this.pushFromTemplate = function(templateUrl) {
     var childScope = $scope.$new();
+    childScope.isVisible = true;
 
     // Load the given template
     TemplateLoader.load(templateUrl).then(function(templateString) {
@@ -122,14 +123,13 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
   };
 
   return {
-    restrict: 'CA',
+    restrict: 'ECA',
     require: '^navs',
     transclude: 'element',
     compile: function(element, attr, transclude) {
       return function($scope, $element, $attr, navCtrl) {
         var lastParent, lastIndex, childScope, childElement;
 
-<<<<<<< HEAD
 
         $scope.title = $attr.title;
         $scope.slideAnimation = $attr.slideAnimation || '';
@@ -143,9 +143,6 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
 
         // Push this controller onto the stack
         $scope.pushController($scope, $element);
-=======
-        $scope.isVisible = true;
->>>>>>> e8bd9a5dee77d29b746115546a51b1a4a3d46246
 
         $scope.$watch('isVisible', function(value) {
           // Taken from ngIf
@@ -161,10 +158,7 @@ angular.module('ionic.ui.nav', ['ionic.service.templateLoad', 'ionic.service.ges
           // Check if this is visible, and if so, create it and show it
           if(value) {
             childScope = $scope.$new();
-<<<<<<< HEAD
 
-=======
->>>>>>> e8bd9a5dee77d29b746115546a51b1a4a3d46246
             transclude(childScope, function(clone) {
               childElement = clone;