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

fix(tabs): reload tab after previous clearHistory()

Browse Source 
Closes #2664
This commit is contained in:
Adam Bradley
2015-02-10 16:39:25 -06:00
parent 2b88b4feac
commit 3628ebac16
3 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/angular/directive/tab.js vendored
View File

@@ -178,6 +178,7 @@ function($compile, $ionicConfig, $ionicBind, $ionicViewSwitcher) {
function destroyTab() {
childScope && childScope.$destroy();
isTabContentAttached && childElement && childElement.remove();
tabContentEle.innerHTML = '';
isTabContentAttached = childScope = childElement = null;
}

2
js/angular/service/viewSwitcher.js vendored
View File

@@ -76,7 +76,7 @@ function($timeout, $document, $q, $ionicClickBlock, $ionicConfig, $ionicNavBarDe
enteringEle = viewEle;
}
} else if (viewEle.data(DATA_ELE_IDENTIFIER) === navViewActiveEleId) {
} else if (isDefined(navViewActiveEleId) && viewEle.data(DATA_ELE_IDENTIFIER) === navViewActiveEleId) {
leavingEle = viewEle;
}

55
test/unit/angular/directive/navView.unit.js
View File

@@ -145,6 +145,13 @@ describe('Ionic nav-view', function() {
}
}
},
tab1page2State = {
views: {
'tab1': {
template: 'tab1page2'
}
}
},
tab2page1State = {
views: {
'tab2': {
@@ -194,6 +201,7 @@ describe('Ionic nav-view', function() {
.state('ionViewCacheFalseProperty', ionViewCacheFalsePropertyState)
.state('tabAbstract', tabAbstractState)
.state('tabAbstract.tab1page1', tab1page1State)
.state('tabAbstract.tab1page2', tab1page2State)
.state('tabAbstract.tab2page1', tab2page1State)
.state('tabAbstract.tab3page1', tab3page1State)
.state('tabAbstract.tab3page2', tab3page2NoCacheState)
@@ -981,6 +989,53 @@ describe('Ionic nav-view', function() {
expect(tab3Ele.getAttribute('nav-view')).toBe('cached');
}));
it('should clear cached tab and reload on return to tab', inject(function ($state, $q, $timeout, $compile, $ionicHistory) {
elem.append($compile('<ion-nav-view name="root"></ion-nav-view>')(scope));
$state.go(tab1page1State);
$q.flush();
$timeout.flush();
var tab1Ele = elem[0].querySelector('ion-nav-view[name="tab1"]');
expect(tab1Ele.getAttribute('nav-view')).toBe('active');
expect(tab1Ele.childElementCount).toBe(1);
$state.go(tab1page2State);
$q.flush();
$timeout.flush();
tab1Ele = elem[0].querySelector('ion-nav-view[name="tab1"]');
expect(tab1Ele.getAttribute('nav-view')).toBe('active');
expect(tab1Ele.childElementCount).toBe(2);
$state.go(tab2page1State);
$q.flush();
$timeout.flush();
var tab2Ele = elem[0].querySelector('ion-nav-view[name="tab2"]');
expect(tab1Ele.getAttribute('nav-view')).toBe('cached');
expect(tab1Ele.childElementCount).toBe(2);
expect(tab2Ele.getAttribute('nav-view')).toBe('active');
expect(tab2Ele.childElementCount).toBe(1);
$ionicHistory.clearCache();
tab1Ele = elem[0].querySelector('ion-nav-view[name="tab1"]');
expect(tab1Ele).toEqual(null);
tab2Ele = elem[0].querySelector('ion-nav-view[name="tab2"]');
expect(tab2Ele.getAttribute('nav-view')).toBe('active');
expect(tab2Ele.childElementCount).toBe(1);
$state.go(tab1page1State);
$q.flush();
$timeout.flush();
tab1Ele = elem[0].querySelector('ion-nav-view[name="tab1"]');
expect(tab1Ele.getAttribute('nav-view')).toBe('active');
expect(tab1Ele.childElementCount).toBe(1);
}));
it('should not cache ion-views when going between history and its the first load, stateParam cache=false', inject(function ($state, $q, $timeout, $compile, $ionicConfig) {
elem.append($compile('<ion-nav-view name="root"></ion-nav-view>')(scope));