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

revert all done

Browse source
This commit is contained in:
Peter Cottle 2013-06-04 14:34:47 -10:00
parent a8fce5a4ab
commit 6931992316
3 changed files with 48 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

36
build/bundle.js
View file

@ -7692,12 +7692,16 @@ GitEngine.prototype.revert = function(whichCommits) {
// set up the promise chain // set up the promise chain
_.each(toRebase, function(commit) { _.each(toRebase, function(commit) {
chain = chain.then(function() { chain = chain.then(function() {
chainStep(commit); return chainStep(commit);
}); });
}, this); }, this);
// done! update our location // done! update our location
// this.setTargetLocation('HEAD', base); chain = chain.then(_.bind(function() {
this.setTargetLocation('HEAD', base);
return this.animationFactory.playRefreshAnimation(this.gitVisuals);
}, this));
this.animationQueue.thenFinish(chain, deferred); this.animationQueue.thenFinish(chain, deferred);
}; };
@ -9229,6 +9233,16 @@ AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals,
animationQueue.thenFinish(animation.getPromise()); animationQueue.thenFinish(animation.getPromise());
}; };
AnimationFactory.prototype.playRefreshAnimation = function(gitVisuals) {
var animation = new PromiseAnimation({
closure: function() {
gitVisuals.refreshTree();
}
});
animation.play();
return animation.getPromise();
};
AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) { AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) {
opacity = (opacity === undefined) ? 1 : opacity; opacity = (opacity === undefined) ? 1 : opacity;
@ -23643,12 +23657,16 @@ GitEngine.prototype.revert = function(whichCommits) {
// set up the promise chain // set up the promise chain
_.each(toRebase, function(commit) { _.each(toRebase, function(commit) {
chain = chain.then(function() { chain = chain.then(function() {
chainStep(commit); return chainStep(commit);
}); });
}, this); }, this);
// done! update our location // done! update our location
// this.setTargetLocation('HEAD', base); chain = chain.then(_.bind(function() {
this.setTargetLocation('HEAD', base);
return this.animationFactory.playRefreshAnimation(this.gitVisuals);
}, this));
this.animationQueue.thenFinish(chain, deferred); this.animationQueue.thenFinish(chain, deferred);
}; };
@ -31383,6 +31401,16 @@ AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals,
animationQueue.thenFinish(animation.getPromise()); animationQueue.thenFinish(animation.getPromise());
}; };
AnimationFactory.prototype.playRefreshAnimation = function(gitVisuals) {
var animation = new PromiseAnimation({
closure: function() {
gitVisuals.refreshTree();
}
});
animation.play();
return animation.getPromise();
};
AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) { AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) {
opacity = (opacity === undefined) ? 1 : opacity; opacity = (opacity === undefined) ? 1 : opacity;

8
src/js/git/index.js
View file

@ -639,12 +639,16 @@ GitEngine.prototype.revert = function(whichCommits) {
// set up the promise chain // set up the promise chain
_.each(toRebase, function(commit) { _.each(toRebase, function(commit) {
chain = chain.then(function() { chain = chain.then(function() {
chainStep(commit); return chainStep(commit);
}); });
}, this); }, this);
// done! update our location // done! update our location
// this.setTargetLocation('HEAD', base); chain = chain.then(_.bind(function() {
this.setTargetLocation('HEAD', base);
return this.animationFactory.playRefreshAnimation(this.gitVisuals);
}, this));
this.animationQueue.thenFinish(chain, deferred); this.animationQueue.thenFinish(chain, deferred);
}; };

10
src/js/visuals/animation/animationFactory.js
View file

@ -88,6 +88,16 @@ AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals,
animationQueue.thenFinish(animation.getPromise()); animationQueue.thenFinish(animation.getPromise());
}; };
AnimationFactory.prototype.playRefreshAnimation = function(gitVisuals) {
var animation = new PromiseAnimation({
closure: function() {
gitVisuals.refreshTree();
}
});
animation.play();
return animation.getPromise();
};
AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) { AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) {
opacity = (opacity === undefined) ? 1 : opacity; opacity = (opacity === undefined) ? 1 : opacity;