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(view): do not register abstract states

Browse Source 
Closes #2642
This commit is contained in:
Adam Bradley
2014-12-07 01:31:07 -06:00
parent cf2556b789
commit 37dd84c6de
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/angular/service/history.js vendored
View File

@@ -284,7 +284,7 @@ function($rootScope, $state, $location, $window, $timeout, $ionicViewSwitcher, $
// create an element from the viewLocals template
ele = $ionicViewSwitcher.createViewEle(viewLocals);
if (this.isAbstractEle(ele)) {
if (this.isAbstractEle(ele, viewLocals)) {
console.log('VIEW', 'abstractView', DIRECTION_NONE, viewHistory.currentView);
return {
action: 'abstractView',
@@ -651,7 +651,10 @@ function($rootScope, $state, $location, $window, $timeout, $ionicViewSwitcher, $
return nextViewOptions;
},
isAbstractEle: function(ele) {
isAbstractEle: function(ele, viewLocals) {
if (viewLocals && viewLocals.$$state && viewLocals.$$state.self.abstract) {
return true;
}
return !!(ele && (isAbstractTag(ele) || isAbstractTag(ele.children())));
},

19
test/unit/angular/service/history.unit.js
View File

@@ -1078,6 +1078,25 @@ describe('Ionic History', function() {
expect($ionicHistory.isAbstractEle(div)).toBe(true);
}));
it('should should be an abstract element from the viewLocals', inject(function($ionicHistory, $document) {
var div = angular.element('<div>');
var viewLocals = {
$$state: {
self: {
abstract: true
}
}
};
expect($ionicHistory.isAbstractEle(div, viewLocals)).toBe(true);
var viewLocals = {
$$state: {
self: {}
}
};
expect($ionicHistory.isAbstractEle(div, viewLocals)).toBe(false);
}));
it('should be an abstract view', inject(function($document) {
var reg = ionicHistory.register({}, {
$template: '<ion-tabs></ion-tabs>'