mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-07 06:57:02 +08:00
Fixes for tab demo
This commit is contained in:
3
js/ext/angular/src/directive/ionicContent.js
vendored
3
js/ext/angular/src/directive/ionicContent.js
vendored
@ -17,6 +17,9 @@ angular.module('ionic.ui.content', [])
|
||||
if(attr.hasHeader) {
|
||||
c.addClass('has-header');
|
||||
}
|
||||
if(attr.hasFooter) {
|
||||
c.addClass('has-footer');
|
||||
}
|
||||
if(attr.hasTabs) {
|
||||
c.addClass('has-tabs');
|
||||
}
|
||||
|
||||
1
js/ext/angular/src/directive/ionicList.js
vendored
1
js/ext/angular/src/directive/ionicList.js
vendored
@ -60,7 +60,6 @@ angular.module('ionic.ui.list', ['ionic.service', 'ngAnimate'])
|
||||
|
||||
$scope.$watch('isEditing', function(v) {
|
||||
_this.isEditing = true;
|
||||
console.log('Is Editing Changed', v);
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
21
js/ext/angular/src/directive/ionicTabBar.js
vendored
21
js/ext/angular/src/directive/ionicTabBar.js
vendored
@ -46,13 +46,21 @@ angular.module('ionic.ui.tabs', [])
|
||||
return {
|
||||
restrict: 'CA',
|
||||
replace: true,
|
||||
transclude: true,
|
||||
template: '<div ng-show="isVisible" ng-transclude></div>',
|
||||
require: '^tabController',
|
||||
scope: true,
|
||||
link: function(scope, element, attrs, tabsCtrl) {
|
||||
scope.$watch('isVisible', function(value) {
|
||||
if(!value) {
|
||||
element[0].style.display = 'none';
|
||||
} else {
|
||||
element[0].style.display = 'block';
|
||||
}
|
||||
});
|
||||
|
||||
scope.title = attrs.title;
|
||||
scope.icon = attrs.icon;
|
||||
scope.iconOn = attrs.iconOn;
|
||||
scope.iconOff = attrs.iconOff;
|
||||
tabsCtrl.addController(scope);
|
||||
}
|
||||
}
|
||||
@ -67,7 +75,7 @@ angular.module('ionic.ui.tabs', [])
|
||||
replace: true,
|
||||
scope: true,
|
||||
template: '<div class="tabs tabs-primary">' +
|
||||
'<tab-item title="{{controller.title}}" icon="{{controller.icon}}" active="controller.isVisible" index="$index" ng-repeat="controller in controllers"></tab-item>' +
|
||||
'<tab-item title="{{controller.title}}" icon="{{controller.icon}}" icon-on="{{controller.iconOn}}" icon-off="{{controller.iconOff}}" active="controller.isVisible" index="$index" ng-repeat="controller in controllers"></tab-item>' +
|
||||
'</div>'
|
||||
}
|
||||
})
|
||||
@ -79,7 +87,8 @@ angular.module('ionic.ui.tabs', [])
|
||||
require: '^tabController',
|
||||
scope: {
|
||||
title: '@',
|
||||
icon: '@',
|
||||
iconOn: '@',
|
||||
iconOff: '@',
|
||||
active: '=',
|
||||
tabSelected: '@',
|
||||
index: '='
|
||||
@ -92,7 +101,9 @@ angular.module('ionic.ui.tabs', [])
|
||||
},
|
||||
template:
|
||||
'<a href="#" ng-class="{active:active}" ng-click="selectTab()" class="tab-item">' +
|
||||
'<i class="{{icon}}"></i> {{title}}' +
|
||||
'<i class="{{icon}}" ng-if="icon"></i>' +
|
||||
'<i class="{{iconOn}}" ng-if="active"></i>' +
|
||||
'<i class="{{iconOff}}" ng-if="!active"></i> {{title}}' +
|
||||
'</a>'
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user