Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add: Using the "transition", to animate scrolling. #1543

Closed
wants to merge 9 commits into from
Closed

Add: Using the "transition", to animate scrolling. #1543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5d535c
Add: Using the "transition", to animate scrolling.
rotorgames Jun 2, 2014
1beec64
Add: Support collectionRepeat
rotorgames Jun 13, 2014
92ae3cb
Fix: onScroll to __callback and compiling at high speed
rotorgames Jun 13, 2014
83ce086
Add: use transitionEnd event instead Zynga Animate
rotorgames Jun 18, 2014
95a0343
Update: cubic-bezier
rotorgames Jun 18, 2014
68d25d7
Lower the speed for scrolling
rotorgames Jul 1, 2014
930ad75
refactor(transition-scroll): Update code to ionic v1.0.0-beta.14
rotorgames Jan 17, 2015
4f5710b
refactor(scrollView): add EasingJsFunctions and EasingCssFunctions
rotorgames Jan 17, 2015
e396df3
style(scrollView): fix code style
rotorgames Jan 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion js/angular/directive/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ function($timeout, $controller, $ionicBind, $ionicConfig) {
scrollbarY: '@',
startX: '@',
startY: '@',
scrollEventInterval: '@'
scrollEventInterval: '@',
hasTransition: '@'
});
$scope.direction = $scope.direction || 'y';

Expand All @@ -118,6 +119,7 @@ function($timeout, $controller, $ionicBind, $ionicConfig) {
delegateHandle: attr.delegateHandle,
locking: (attr.locking || 'true') === 'true',
bouncing: $scope.$eval($scope.hasBouncing),
transition: $scope.$eval($scope.hasTransition) || 0,
startX: $scope.$eval($scope.startX) || 0,
startY: $scope.$eval($scope.startY) || 0,
scrollbarX: $scope.$eval($scope.scrollbarX) !== false,
Expand Down
4 changes: 3 additions & 1 deletion js/angular/directive/scroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ function($timeout, $controller, $ionicBind) {
scrollbarY: '@',
zooming: '@',
minZoom: '@',
maxZoom: '@'
maxZoom: '@',
hasTransition: '@'
});
$scope.direction = $scope.direction || 'y';

Expand All @@ -92,6 +93,7 @@ function($timeout, $controller, $ionicBind) {
locking: ($attr.locking || 'true') === 'true',
bouncing: $scope.$eval($attr.hasBouncing),
paging: isPaging,
transition: $scope.$eval($scope.hasTransition) || false,
scrollbarX: $scope.$eval($scope.scrollbarX) !== false,
scrollbarY: $scope.$eval($scope.scrollbarY) !== false,
scrollingX: $scope.direction.indexOf('x') >= 0,
Expand Down
15 changes: 13 additions & 2 deletions js/angular/service/collectionRepeatManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ function($rootScope, $timeout) {
this.setCurrentIndex(0);

//Override scrollview's render callback
this.scrollView.__$callback = this.scrollView.__callback;
this.scrollView.__callback = angular.bind(this, this.renderScroll);
if(this.scrollView.options.transition){
this.scrollView.__onScrollTransition = angular.bind(this, this.renderScrollTransition);
}else{
this.scrollView.__$callback = this.scrollView.__callback;
this.scrollView.__callback = angular.bind(this, this.renderScroll);
}

function getViewportSize() { return self.viewportSize; }
//Set getters and setters to match whether this scrollview is vertical or not
Expand Down Expand Up @@ -192,6 +196,13 @@ function($rootScope, $timeout) {
return this.scrollView.__$callback(transformLeft, transformTop, zoom, wasResize);
}),

renderScrollTransition: function(transformLeft, transformTop){
if (this.isVertical) {
this.renderIfNeeded(transformTop);
} else {
this.renderIfNeeded(transformLeft);
}
},
renderIfNeeded: function(scrollPos) {
if ((this.hasNextIndex && scrollPos >= this.nextPos) ||
(this.hasPrevIndex && scrollPos < this.previousPos)) {
Expand Down
Loading