From b12c93f0873e1f9749f2ab0d6af9b4fc74ecf0d6 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 4 Oct 2013 13:31:16 -0500 Subject: [PATCH] Toderp signup and nav controller fixes --- dist/ionic-angular.js | 25 ++++++-- dist/ionic.js | 54 +++++++++++++++++- example/toderp2/css/app.css | 8 +++ example/toderp2/index.html | 73 +++++++++++++++++++++--- example/toderp2/js/controllers.js | 17 +++--- js/controllers/navController.js | 18 ++++++ js/ext/angular/src/directive/ionicNav.js | 25 ++++++-- js/ext/angular/test/nav.html | 6 +- 8 files changed, 194 insertions(+), 32 deletions(-) diff --git a/dist/ionic-angular.js b/dist/ionic-angular.js index 35c749476e..c00254fc18 100644 --- a/dist/ionic-angular.js +++ b/dist/ionic-angular.js @@ -68,6 +68,12 @@ angular.module('ionic.ui.nav', ['ionic.service']) navBar: { shouldGoBack: function() { }, + show: function() { + this.isVisible = true; + }, + hide: function() { + this.isVisible = false; + }, setTitle: function(title) { $scope.navController.title = title; }, @@ -101,15 +107,16 @@ angular.module('ionic.ui.nav', ['ionic.service']) .directive('navBar', function() { return { restrict: 'E', - require: '^navController', + require: '^navCtrl', transclude: true, replace: true, scope: true, - template: '
' + - 'Back' + - '

{{getTopController().title}}

' + + template: '
' + + 'Back' + + '

{{navController.getTopController().title}}

' + '
', link: function(scope, element, attrs, navCtrl) { + scope.navController = navCtrl; scope.goBack = function() { navCtrl.pop(); } @@ -120,9 +127,17 @@ angular.module('ionic.ui.nav', ['ionic.service']) .directive('navContent', function() { return { restrict: 'ECA', + require: '^navCtrl', scope: true, - link: function(scope, element, attrs) { + link: function(scope, element, attrs, navCtrl) { scope.title = attrs.title; + + if(attrs.navBar === "false") { + navCtrl.hideNavBar(); + } else { + navCtrl.showNavBar(); + } + scope.isVisible = true; scope.pushController(scope); diff --git a/dist/ionic.js b/dist/ionic.js index c2840417da..e6b946073b 100644 --- a/dist/ionic.js +++ b/dist/ionic.js @@ -2119,6 +2119,16 @@ ionic.views.TabBar.prototype = { ; (function(ionic) { +/** + * The NavController makes it easy to have a stack + * of views or screens that can be pushed and popped + * for a dynamic navigation flow. This API is modelled + * off of the UINavigationController in iOS. + * + * The NavController can drive a nav bar to show a back button + * if the stack can be poppped to go back to the last view, and + * it will handle updating the title of the nav bar and processing animations. + */ ionic.controllers.NavController = function(opts) { var _this = this; @@ -2135,12 +2145,26 @@ ionic.controllers.NavController = function(opts) { }; ionic.controllers.NavController.prototype = { + /** + * @return {array} the array of controllers on the stack. + */ getControllers: function() { return this.controllers; }, + + /** + * @return {object} the controller at the top of the stack. + */ getTopController: function() { return this.controllers[this.controllers.length-1]; }, + + /** + * Push a new controller onto the navigation stack. The new controller + * will automatically become the new visible view. + * + * @param {object} controller the controller to push on the stack. + */ push: function(controller) { var last = this.controllers[this.controllers.length - 1]; @@ -2175,6 +2199,12 @@ ionic.controllers.NavController.prototype = { return controller; }, + /** + * Pop the top controller off the stack, and show the last one. This is the + * "back" operation. + * + * @return {object} the last popped controller + */ pop: function() { var next, last; @@ -2207,8 +2237,27 @@ ionic.controllers.NavController.prototype = { return last; }, + /** + * Show the NavBar (if any) + */ + showNavBar: function() { + if(this.navBar) { + this.navBar.show(); + } + }, + + /** + * Hide the NavBar (if any) + */ + hideNavBar: function() { + if(this.navBar) { + this.navBar.hide(); + } + }, + + // Update the nav bar after a push or pop _updateNavBar: function() { - if(!this.getTopController()) { + if(!this.getTopController() || !this.navBar) { return; } @@ -2219,8 +2268,7 @@ ionic.controllers.NavController.prototype = { } else { this.navBar.showBackButton(false); } - }, - + } }; })(window.ionic); ; diff --git a/example/toderp2/css/app.css b/example/toderp2/css/app.css index c11eeeda06..055c74a63d 100644 --- a/example/toderp2/css/app.css +++ b/example/toderp2/css/app.css @@ -18,3 +18,11 @@ } #splash-view .ionic-logo { } + +#signup-bottom { + position: fixed; + bottom: 0; + left: 0; + width: 100%; + text-align: center; +} diff --git a/example/toderp2/index.html b/example/toderp2/index.html index dc9dfc13e7..574642b0ef 100644 --- a/example/toderp2/index.html +++ b/example/toderp2/index.html @@ -32,27 +32,82 @@ + - - - + + + + @@ -64,7 +64,7 @@ '')(childScope, cb); } - angular.module('navTest', ['ionic.ui']) + angular.module('navTest', ['ionic.ui.nav']) .controller('AppCtrl', function($scope, $compile, $element) { pushIt($scope, $compile, $element, function(cloned, scope) {