mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 16:38:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rebase interactive with animations

Browse source
This commit is contained in:
Peter Cottle 2012-10-23 20:18:18 -07:00
parent c3ce495d56
commit a5da6f76b8
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/git.js
View file

@ -869,8 +869,19 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
// now do stuff :D since all our validation checks have passed, we are going to defer animation // now do stuff :D since all our validation checks have passed, we are going to defer animation
// and actually launch the dialog // and actually launch the dialog
// this.animationQueue.set('defer', true); this.animationQueue.set('defer', true);
this.rebaseFinish(toRebase, {}, targetSource, currentLocation);
var callback = _.bind(function(userSpecifiedRebase) {
var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation);
animationFactory.rebaseAnimation(this.animationQueue, animationData, this);
this.animationQueue.start();
}, this);
setTimeout(function() {
callback(toRebase);
}, 2000);
}; };
GitEngine.prototype.rebaseFinish = function(toRebaseRough, stopSet, targetSource, currentLocation) { GitEngine.prototype.rebaseFinish = function(toRebaseRough, stopSet, targetSource, currentLocation) {
@ -1167,7 +1178,7 @@ GitEngine.prototype.dispatch = function(command, callback) {
} }
// only add the refresh if we didn't do manual animations // only add the refresh if we didn't do manual animations
if (!this.animationQueue.get('animations').length) { if (!this.animationQueue.get('animations').length && !this.animationQueue.get('defer')) {
this.animationQueue.add(new Animation({ this.animationQueue.add(new Animation({
closure: function() { closure: function() {
gitVisuals.refreshTree(); gitVisuals.refreshTree();