javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tabs): preventDefault when anchor is clicked

Browse Source
This commit is contained in:
Andy Joslin
2014-02-25 12:27:04 -05:00
parent 3419e40e52
commit bdcd6bb15f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/ext/angular/src/directive/ionicTabBar.js vendored
View File

@@ -245,7 +245,7 @@ function($scope, $ionicViewService, $rootScope, $element) {
require: ['^ionTabs', '^ionTab'],
template:
'<a ng-class="{active: isTabActive(), \'has-badge\':badge}" ' +
'ng-click="selectTab()" class="tab-item">' +
'ng-click="selectTab($event)" class="tab-item">' +
'<span class="badge {{badgeStyle}}" ng-if="badge">{{badge}}</span>' +
'<i class="icon {{iconOn}}" ng-if="iconOn && isTabActive()"></i>' +
'<i class="icon {{iconOff}}" ng-if="iconOff && !isTabActive()"></i>' +
@@ -273,7 +273,8 @@ function($scope, $ionicViewService, $rootScope, $element) {
$scope.isTabActive = function() {
return tabsCtrl.selectedTab === tabCtrl.$scope;
};
$scope.selectTab = function() {
$scope.selectTab = function(e) {
e.preventDefault();
tabsCtrl.select(tabCtrl.$scope, true);
};
};

7
test/e2e/viewState/test.js
View File

@@ -1,8 +1,6 @@
describe('tabs test page', function() {
var P;
describe('viewState', function() {
beforeEach(function() {
browser.get('http://localhost:8080/test/e2e/viewState/test.html');
P = protractor.getInstance();
});
function navTitle() {
@@ -15,7 +13,6 @@ describe('tabs test page', function() {
}
it('navbar with multiple histories', function() {
browser.sleep(1000);
expect(navTitle().getText()).toBe('Sign-In');
expect(navButtons('back').getAttribute('class')).toContain('hide');
expect(navButtons('left').getText()).toEqual('Home');
@@ -40,7 +37,7 @@ describe('tabs test page', function() {
expect(navButtons('left').isPresent()).toBe(false);
expect(navButtons('right').isPresent()).toBe(false);
element(by.css('.tabs a.tab-item:nth-child(2)')).click();
element(by.css('.tabs a:nth-child(2)')).click();
expect(navTitle().getText()).toBe('Add Auto');
expect(navButtons('back').getAttribute('class')).toContain('hide');