mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 08:28:50 +02:00
have somewhat ok global lock on animation down, better than nothing
This commit is contained in:
parent
ef5ff59cca
commit
a9e4d5a9a6
5 changed files with 18 additions and 103 deletions
51
src/git.js
51
src/git.js
|
@ -568,57 +568,6 @@ GitEngine.prototype.rebaseStarter = function() {
|
|||
animationFactory.rebaseAnimation(this.animationQueue, response, this);
|
||||
};
|
||||
|
||||
GitEngine.prototype.rebaseAnimation = function(response) {
|
||||
/*
|
||||
// TODO: move to animation factory
|
||||
var start = function() {
|
||||
// maybe search stuff??
|
||||
};
|
||||
|
||||
this.animationQueue.add(new Animation({
|
||||
closure: start
|
||||
}));
|
||||
|
||||
// first set all birth positions...
|
||||
_.each(response, function(step) {
|
||||
step.newCommit.get('visNode').setBirth();
|
||||
}, this);
|
||||
|
||||
var fixedOpacity = 0.8;
|
||||
// then fix all opacities... ugh
|
||||
_.each(response, function(step) {
|
||||
_.each(step.snapshot, function(obj) {
|
||||
_.each(obj, function(attr) {
|
||||
if (attr.opacity !== undefined) {
|
||||
attr.opacity = fixedOpacity;
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
var time = GRAPHICS.defaultAnimationTime;
|
||||
var bounceTime = time * 2.0;
|
||||
|
||||
_.each(response, function(step) {
|
||||
this.animationQueue.add(new Animation({
|
||||
closure: function() {
|
||||
var id = step.newCommit.get('id');
|
||||
var vNode = step.newCommit.get('visNode');
|
||||
|
||||
vNode.setBirth();
|
||||
vNode.setOutgoingEdgesBirthPosition();
|
||||
|
||||
vNode.animateOutgoingEdgesFromSnapshot(step.snapshot, bounceTime, 'bounce');
|
||||
vNode.animateFromAttr(step.snapshot[id], bounceTime, 'bounce');
|
||||
},
|
||||
duration: Math.max(bounceTime, time)
|
||||
}));
|
||||
}, this);
|
||||
|
||||
animationFactory.refreshTree(this.animationQueue);
|
||||
*/
|
||||
};
|
||||
|
||||
GitEngine.prototype.rebase = function(targetSource, currentLocation) {
|
||||
// first some conditions
|
||||
if (this.isUpstreamOf(targetSource, currentLocation)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue