From 4586516e0ecb7b70c49305eb07618b686790dd20 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Tue, 19 Nov 2013 15:51:04 -0600
Subject: [PATCH] Button click support

---
 dist/js/ionic-angular.js                       | 13 ++++++++-----
 js/ext/angular/src/directive/ionicNavRouter.js | 11 +++++++----
 js/ext/angular/src/directive/ionicTabBar.js    |  2 +-
 js/ext/angular/test/navAndTabs.html            | 10 ++++++++--
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index fe0c1dd761..90fa8f17b9 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -25430,11 +25430,11 @@ angular.module('ionic.ui.navRouter', [])
     template: '<header class="bar bar-header nav-bar" ng-class="{hidden: !navController.navBar.isVisible}">' + 
         '<div class="buttons"> ' +
           '<button nav-back class="button" ng-if="enableBackButton && showBackButton" ng-class="backButtonType" ng-bind-html="backButtonContent"></button>' +
-          '<button ng-repeat="button in leftButtons" class="button" ng-bind="button.text"></button>' + 
+          '<button ng-click="button.tap($event)" ng-repeat="button in leftButtons" class="button {{button.type}}" ng-bind="button.text"></button>' + 
         '</div>' +
         '<h1 class="title" ng-bind="currentTitle"></h1>' + 
         '<div class="buttons"> ' +
-          '<button ng-repeat="button in rightButtons" class="button" ng-bind="button.text"></button>' + 
+          '<button ng-click="button.tap($event)" ng-repeat="button in rightButtons" class="button {{button.type}}" ng-bind="button.text"></button>' + 
         '</div>' +
       '</header>',
     link: function($scope, $element, $attr, navCtrl) {
@@ -25478,7 +25478,10 @@ angular.module('ionic.ui.navRouter', [])
 
         var oldTitle = $scope.currentTitle;
         $scope.oldTitle = oldTitle;
-        $scope.currentTitle = data.title;
+
+        if(typeof data.title !== 'undefined') {
+          $scope.currentTitle = data.title;
+        }
 
         if(typeof data.leftButtons !== 'undefined') {
           $scope.leftButtons = data.leftButtons;
@@ -25490,7 +25493,7 @@ angular.module('ionic.ui.navRouter', [])
           $scope.enableBackButton = data.hideBackButton !== true;
         }
 
-        if(data.animate !== false) {
+        if(data.animate !== false && typeof data.title !== 'undefined') {
           animate($scope, $element, oldTitle, data, function() {
             hb.align();
           });
@@ -26041,7 +26044,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
                     rightButtons: $scope.rightButtons,
                     leftButtons: $scope.leftButtons,
                     hideBackButton: $scope.hideBackButton || false,
-                    animate: $scope.animate || false
+                    animate: $scope.animate || true
                   });
                 }
                 //$scope.$emit('navRouter.titleChanged', $scope.title);
diff --git a/js/ext/angular/src/directive/ionicNavRouter.js b/js/ext/angular/src/directive/ionicNavRouter.js
index 0a7fce1c69..fdc0fd9b20 100644
--- a/js/ext/angular/src/directive/ionicNavRouter.js
+++ b/js/ext/angular/src/directive/ionicNavRouter.js
@@ -167,11 +167,11 @@ angular.module('ionic.ui.navRouter', [])
     template: '<header class="bar bar-header nav-bar" ng-class="{hidden: !navController.navBar.isVisible}">' + 
         '<div class="buttons"> ' +
           '<button nav-back class="button" ng-if="enableBackButton && showBackButton" ng-class="backButtonType" ng-bind-html="backButtonContent"></button>' +
-          '<button ng-repeat="button in leftButtons" class="button" ng-bind="button.text"></button>' + 
+          '<button ng-click="button.tap($event)" ng-repeat="button in leftButtons" class="button {{button.type}}" ng-bind="button.text"></button>' + 
         '</div>' +
         '<h1 class="title" ng-bind="currentTitle"></h1>' + 
         '<div class="buttons"> ' +
-          '<button ng-repeat="button in rightButtons" class="button" ng-bind="button.text"></button>' + 
+          '<button ng-click="button.tap($event)" ng-repeat="button in rightButtons" class="button {{button.type}}" ng-bind="button.text"></button>' + 
         '</div>' +
       '</header>',
     link: function($scope, $element, $attr, navCtrl) {
@@ -215,7 +215,10 @@ angular.module('ionic.ui.navRouter', [])
 
         var oldTitle = $scope.currentTitle;
         $scope.oldTitle = oldTitle;
-        $scope.currentTitle = data.title;
+
+        if(typeof data.title !== 'undefined') {
+          $scope.currentTitle = data.title;
+        }
 
         if(typeof data.leftButtons !== 'undefined') {
           $scope.leftButtons = data.leftButtons;
@@ -227,7 +230,7 @@ angular.module('ionic.ui.navRouter', [])
           $scope.enableBackButton = data.hideBackButton !== true;
         }
 
-        if(data.animate !== false) {
+        if(data.animate !== false && typeof data.title !== 'undefined') {
           animate($scope, $element, oldTitle, data, function() {
             hb.align();
           });
diff --git a/js/ext/angular/src/directive/ionicTabBar.js b/js/ext/angular/src/directive/ionicTabBar.js
index 5a3795cd34..8e783b5624 100644
--- a/js/ext/angular/src/directive/ionicTabBar.js
+++ b/js/ext/angular/src/directive/ionicTabBar.js
@@ -138,7 +138,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
                     rightButtons: $scope.rightButtons,
                     leftButtons: $scope.leftButtons,
                     hideBackButton: $scope.hideBackButton || false,
-                    animate: $scope.animate || false
+                    animate: $scope.animate || true
                   });
                 }
                 //$scope.$emit('navRouter.titleChanged', $scope.title);
diff --git a/js/ext/angular/test/navAndTabs.html b/js/ext/angular/test/navAndTabs.html
index 0f3346fdce..ced699a4cd 100644
--- a/js/ext/angular/test/navAndTabs.html
+++ b/js/ext/angular/test/navAndTabs.html
@@ -17,7 +17,7 @@
     </pane>
 
     <script id="page1.html" type="text/ng-template">
-      <nav-page title="'Pets'" hide-back-button="true">
+      <nav-page hide-back-button="true">
         <tabs tabs-style="tabs-icon-top" tabs-type="tabs-positive">
 
           <!-- Pets tab -->
@@ -133,7 +133,13 @@
 
       .controller('AdoptCtrl', function($scope) {
         $scope.buttons = [
-          { text: 'Adopt' }
+        { 
+          text: 'Adopt',
+          tap: function(e) {
+            console.log('ADOPT TAPPED');
+          },
+          type: 'button-clear'
+        }
         ];
       });