Angular cleanup and content working

js/ext/angular/src/directive/ionicContent.js

@@ -0,0 +1,46 @@
+angular.module('ionic.ui.content', {})
+
+/*
+.directive('content', function() {
+  return {
+    restrict: 'E',
+    replace: true,
+    template: '<div class="content"></div>'
+  }
+});
+*/
+
+/*
+.directive('content', function() {
+  return {
+    restrict: 'E',
+    replace: true,
+    transclude: true,
+    scope: {
+      hasHeader: '@',
+      hasTabs: '@'
+    },
+    template: '<div class="content" ng-class="{\'has-header\': hasHeader, \'has-tabs\': hasTabs}" ng-transclude></div>'
+  }
+})
+*/
+
+.directive('content', function() {
+  return {
+    restrict: 'E',
+    replace: true,
+    transclude: true,
+    scope: true,
+    template: '<div class="content" ng-class="{\'has-header\': hasHeader, \'has-tabs\': hasTabs}"></div>',
+    compile: function(element, attr, transclude, navCtrl) {
+      return function($scope, $element, $attr) {
+        $scope.hasHeader = attr.hasHeader;
+        $scope.hasTabs = attr.hasTabs;
+
+        var newScope = $scope.$parent.$new();
+
+        $element.append(transclude(newScope));
+      };
+    }
+  }
+})

js/ext/angular/src/directive/ionicNav.js

@@ -1,24 +1,8 @@
-angular.module('ionic.ui', ['ngTouch'])
-
-.directive('content', function() {
-  return {
-    restrict: 'E',
-    replace: true,
-    transclude: true,
-    scope: true,
-    template: '<div class="content" ng-class="{\'has-header\': hasHeader, \'has-tabs\': hasTabs}"></div>',
-    compile: function(element, attr, transclude, navCtrl) {
-      return function($scope, $element, $attr) {
-        $scope.hasHeader = attr.hasHeader;
-      };
-    }
-  }
-})
+angular.module('ionic.ui.nav', ['ionic.ui'])
 
 .controller('NavCtrl', function($scope, $element, $compile) {
   var _this = this;
 
-
   angular.extend(this, ionic.controllers.NavController.prototype);
 
   ionic.controllers.NavController.call(this, {
@@ -42,7 +26,6 @@ angular.module('ionic.ui', ['ngTouch'])
   }
 
   $scope.pushController = function(controller) {
-    //console.log('PUSHING OCNTROLLER', controller);
     _this.push(controller);
   }
 

js/ext/angular/src/directive/ionicSideMenu.js

@@ -1,4 +1,4 @@
-angular.module('ionic.ui', [])
+angular.module('ionic.ui.sideMenu', [])
 
 .controller('SideMenuCtrl', function($scope) {
   var _this = this;

js/ext/angular/src/directive/ionicTabBar.js

@@ -1,17 +1,4 @@
-angular.module('ionic.ui', [])
-
-.directive('content', function() {
-  return {
-    restrict: 'E',
-    replace: true,
-    transclude: true,
-    scope: {
-      hasHeader: '@',
-      hasTabs: '@'
-    },
-    template: '<div class="content" ng-class="{\'has-header\': hasHeader, \'has-tabs\': hasTabs}" ng-transclude></div>'
-  }
-})
+angular.module('ionic.ui.tabs', ['ionic.ui.content'])
 
 .controller('TabsCtrl', function($scope) {
   var _this = this;

js/ext/angular/src/ionicContent.js

@@ -1,9 +0,0 @@
-angular.module('ionic.ui.content', {})
-
-.directive('content', function() {
-  return {
-    restrict: 'E',
-    replace: true,
-    template: '<div class="content"></div>'
-  }
-});