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

switching tabs should not use $animate

Browse Source
This commit is contained in:
Adam Bradley
2014-01-13 09:37:16 -06:00
parent 7581c45b21
commit 3a598aa21e
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dist/js/ionic-angular.js vendored
View File

@@ -2224,7 +2224,6 @@ angular.module('ionic.ui.tabs', ['ionic.service.view'])
});
$scope.$watch('activeAnimation', function(value) {
//$element.removeClass($scope.animation + ' ' + $scope.animation + '-reverse');
$element.addClass($scope.activeAnimation);
});
transclude($scope, function(cloned) {
@@ -2237,7 +2236,7 @@ angular.module('ionic.ui.tabs', ['ionic.service.view'])
}])
// Generic controller directive
.directive('tab', ['ViewService', '$rootScope', '$animate', '$parse', function(ViewService, $rootScope, $animate, $parse) {
.directive('tab', ['ViewService', '$rootScope', '$parse', function(ViewService, $rootScope, $parse) {
return {
restrict: 'E',
require: '^tabs',
@@ -2288,29 +2287,27 @@ angular.module('ionic.ui.tabs', ['ionic.service.view'])
$scope.$watch('isVisible', function(value) {
if(childElement) {
$animate.leave(childElement);
childElement.remove();
childElement = null;
$scope.$broadcast('tab.hidden');
childElement = undefined;
}
if(childScope) {
childScope.$destroy();
childScope = undefined;
childScope = null;
}
if(value) {
childScope = $scope.$new();
transclude(childScope, function(clone) {
childElement = clone;
clone.addClass('pane');
$animate.enter(clone, $element.parent(), $element);
clone.removeAttr('title');
childElement = clone;
$element.parent().append(childElement);
$scope.$broadcast('tab.shown');
});
}
});
// check if it has a ui-view in it
// on link, check if it has a nav-view in it
transclude($scope.$new(), function(clone) {
var navViewEle = clone[0].getElementsByTagName("nav-view");
$scope.hasNavView = (navViewEle.length > 0);

4
dist/js/ionic-angular.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -112,7 +112,6 @@ angular.module('ionic.ui.tabs', ['ionic.service.view'])
});
$scope.$watch('activeAnimation', function(value) {
//$element.removeClass($scope.animation + ' ' + $scope.animation + '-reverse');
$element.addClass($scope.activeAnimation);
});
transclude($scope, function(cloned) {
@@ -125,7 +124,7 @@ angular.module('ionic.ui.tabs', ['ionic.service.view'])
}])
// Generic controller directive
.directive('tab', ['ViewService', '$rootScope', '$animate', '$parse', function(ViewService, $rootScope, $animate, $parse) {
.directive('tab', ['ViewService', '$rootScope', '$parse', function(ViewService, $rootScope, $parse) {
return {
restrict: 'E',
require: '^tabs',
@@ -176,29 +175,27 @@ angular.module('ionic.ui.tabs', ['ionic.service.view'])
$scope.$watch('isVisible', function(value) {
if(childElement) {
$animate.leave(childElement);
childElement.remove();
childElement = null;
$scope.$broadcast('tab.hidden');
childElement = undefined;
}
if(childScope) {
childScope.$destroy();
childScope = undefined;
childScope = null;
}
if(value) {
childScope = $scope.$new();
transclude(childScope, function(clone) {
childElement = clone;
clone.addClass('pane');
$animate.enter(clone, $element.parent(), $element);
clone.removeAttr('title');
childElement = clone;
$element.parent().append(childElement);
$scope.$broadcast('tab.shown');
});
}
});
// check if it has a ui-view in it
// on link, check if it has a nav-view in it
transclude($scope.$new(), function(clone) {
var navViewEle = clone[0].getElementsByTagName("nav-view");
$scope.hasNavView = (navViewEle.length > 0);