diff --git a/hacking/NavAngular.js b/hacking/NavAngular.js new file mode 100644 index 0000000000..a8210f560d --- /dev/null +++ b/hacking/NavAngular.js @@ -0,0 +1,79 @@ +angular.module('ionic.ui', ['ngTouch']) + +.directive('content', function() { + return { + restrict: 'E', + replace: true, + transclude: true, + scope: { + hasHeader: '@', + hasTabs: '@' + }, + template: '
' + } +}) + +.controller('NavCtrl', function($scope) { + var _this = this; + + angular.extend(this, NavController.prototype); + + NavController.call(this, { + content: { + }, + navBar: { + shouldGoBack: function() { + }, + setTitle: function(title) { + }, + showBackButton: function(show) { + }, + } + }); +}) + +.directive('navController', function() { + return { + restrict: 'E', + replace: true, + scope: {}, + transclude: true, + controller: 'NavCtrl', + //templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html', + template: '
', + compile: function(element, attr, transclude, tabsCtrl) { + return function($scope, $element, $attr) { + }; + } + } +}) + +.directive('navBar', function() { + return { + restrict: 'E', + require: '^navController', + transclude: true, + replace: true, + template: '' + } +}) + +.directive('navContent', function() { + return { + restrict: 'E', + require: '^navController', + scope: { + title: '=' + }, + transclude: true, + replace: true, + template: '
', + link: function(scope, element, attrs, tabsCtrl) { + scope.$watch('title', function(value) { + console.log('Title chnaged', value); + }); + } + } +}); diff --git a/hacking/NavController.js b/hacking/NavController.js index 9a81750860..579c6572c0 100644 --- a/hacking/NavController.js +++ b/hacking/NavController.js @@ -35,13 +35,13 @@ // Actually switch the active controllers // Remove the old one - last && last.detach(); + //last && last.detach(); // Grab the top controller on the stack var next = this.controllers[this.controllers.length - 1]; // TODO: No DOM stuff here - this.content.el.appendChild(next.el); + //this.content.el.appendChild(next.el); // Switch to it (TODO: Animate or such things here) this.topController = next; @@ -63,12 +63,12 @@ last = this.controllers.pop(); // Remove the old one - last && last.detach(); + //last && last.detach(); next = this.controllers[this.controllers.length - 1]; // TODO: No DOM stuff here - this.content.el.appendChild(next.el); + //this.content.el.appendChild(next.el); // Switch to it (TODO: Animate or such things here) this.topController = next; diff --git a/hacking/navAngular.html b/hacking/navAngular.html new file mode 100644 index 0000000000..de75b9f846 --- /dev/null +++ b/hacking/navAngular.html @@ -0,0 +1,35 @@ + + + + Nav Bars + + + + + + + + + + + + + + + +

{{title}}

+
+
+
+ + + + + + + diff --git a/hacking/tabs.html b/hacking/tabs.html index 11deef01b7..1eb838befc 100644 --- a/hacking/tabs.html +++ b/hacking/tabs.html @@ -43,6 +43,19 @@