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

awesome revert highlight down

Browse source
This commit is contained in:
Peter Cottle 2013-06-04 14:31:14 -10:00
parent 2e10b6c173
commit a8fce5a4ab
3 changed files with 64 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -608,7 +608,7 @@ GitEngine.prototype.revert = function(whichCommits) {
// go highlight all the ones we will rebase first, in order
var destBranch = this.resolveID(toRebase[0]);
_.each(whichCommits, function(commit) {
_.each(toRebase, function(commit) {
chain = chain.then(_.bind(function() {
return this.animationFactory.playHighlightPromiseAnimation(
commit,
@ -637,7 +637,7 @@ GitEngine.prototype.revert = function(whichCommits) {
}, this);
// set up the promise chain
_.each(whichCommits, function(commit) {
_.each(toRebase, function(commit) {
chain = chain.then(function() {
chainStep(commit);
});
@ -915,7 +915,7 @@ GitEngine.prototype.commitStarter = function() {
newCommit,
this.gitVisuals
);
this.animationQueue.thenFinish(promise, deferred);
this.animationQueue.thenFinish(promise);
};
GitEngine.prototype.commit = function() {

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

@ -173,15 +173,25 @@ AnimationFactory.prototype.rebaseHighlightPart = function(animationQueue, rebase
this.delay(animationQueue, fullTime * 2);
};
AnimationFactory.prototype.genHighlightPromiseAnmation = function(commit, destBranch) {
var visBranch = destBranch.get('visBranch');
AnimationFactory.prototype.genHighlightPromiseAnimation = function(commit, destObj) {
// could be branch or node
var visObj = destObj.get('visBranch') || destObj.get('visNode');
var visNode = commit.get('visNode');
return new PromiseAnimation(makeHighlightAnimation(visNode, visBranch));
return new PromiseAnimation(makeHighlightAnimation(visNode, visObj));
};
AnimationFactory.prototype.playHighlightPromiseAnimation = function(commit, destBranch) {
var animation = this.genHighlightPromiseAnimation(commit, destBranch);
AnimationFactory.prototype.playHighlightPromiseAnimation = function(commit, destObj) {
console.log('playing highlight animation');
try {
var animation = this.genHighlightPromiseAnimation(commit, destObj);
console.log('aniamtion duration', animation.get('duration'));
animation.play();
console.log('aniamtion duration', animation.get('duration'));
animation.getPromise();
} catch (e) {
debugger;
console.log(e);
}
return animation.getPromise();
};