From bebdb776df8536a06463d68ba969b7c531fb092b Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 1 Nov 2013 18:43:51 -0500 Subject: [PATCH] Tab stuff --- dist/js/ionic-angular.js | 14 ++++++-------- js/ext/angular/src/directive/ionicTabBar.js | 14 ++++++-------- js/ext/angular/test/tabs.html | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index 665275db71..29a856e710 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -1022,6 +1022,11 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) return function($scope, $element, $attr, tabsCtrl) { var childScope, childElement; + $scope.title = $attr.title; + $scope.icon = $attr.icon; + $scope.iconOn = $attr.iconOn; + $scope.iconOff = $attr.iconOff; + tabsCtrl.add($scope); $scope.$watch('isVisible', function(value) { if(childElement) { @@ -1041,13 +1046,6 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) }); } }); - - $scope.title = $attr.title; - $scope.icon = $attr.icon; - $scope.iconOn = $attr.iconOn; - $scope.iconOff = $attr.iconOff; - tabsCtrl.add($scope); - } } }; @@ -1061,7 +1059,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) transclude: true, replace: true, scope: true, - template: '
' + + template: '
' + '' + '
' }; diff --git a/js/ext/angular/src/directive/ionicTabBar.js b/js/ext/angular/src/directive/ionicTabBar.js index 1b8dfbd59c..a45c6a0614 100644 --- a/js/ext/angular/src/directive/ionicTabBar.js +++ b/js/ext/angular/src/directive/ionicTabBar.js @@ -80,6 +80,11 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) return function($scope, $element, $attr, tabsCtrl) { var childScope, childElement; + $scope.title = $attr.title; + $scope.icon = $attr.icon; + $scope.iconOn = $attr.iconOn; + $scope.iconOff = $attr.iconOff; + tabsCtrl.add($scope); $scope.$watch('isVisible', function(value) { if(childElement) { @@ -99,13 +104,6 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) }); } }); - - $scope.title = $attr.title; - $scope.icon = $attr.icon; - $scope.iconOn = $attr.iconOn; - $scope.iconOff = $attr.iconOff; - tabsCtrl.add($scope); - } } }; @@ -119,7 +117,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate']) transclude: true, replace: true, scope: true, - template: '
' + + template: '
' + '' + '
' }; diff --git a/js/ext/angular/test/tabs.html b/js/ext/angular/test/tabs.html index b25239cf96..c35da23574 100644 --- a/js/ext/angular/test/tabs.html +++ b/js/ext/angular/test/tabs.html @@ -74,7 +74,7 @@ - +

Deadlines