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

know why its beause git engine ready is async and we dont have origin until that fires so animation gets messed up

Browse source
This commit is contained in:
Peter Cottle 2013-06-02 17:43:56 -07:00
parent f438948660
commit b69c35d548
3 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
build/bundle.js
View file

@ -7327,8 +7327,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
); );
originMaster.set('remote', true); originMaster.set('remote', true);
// add a simple refresh animation this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
}; };
GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) { GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {
@ -9222,6 +9221,16 @@ AnimationFactory.prototype.playCommitBirthPromiseAnimation = function(commit, gi
return animation.getPromise(); return animation.getPromise();
}; };
AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals, animationQueue) {
var animation = new PromiseAnimation({
closure: function() {
gitVisuals.refreshTree();
}
});
animation.play();
animationQueue.thenFinish(animation.getPromise());
};
AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) { AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) {
opacity = (opacity === undefined) ? 1 : opacity; opacity = (opacity === undefined) ? 1 : opacity;
@ -23250,8 +23259,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
); );
originMaster.set('remote', true); originMaster.set('remote', true);
// add a simple refresh animation this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
}; };
GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) { GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {
@ -31348,6 +31356,16 @@ AnimationFactory.prototype.playCommitBirthPromiseAnimation = function(commit, gi
return animation.getPromise(); return animation.getPromise();
}; };
AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals, animationQueue) {
var animation = new PromiseAnimation({
closure: function() {
gitVisuals.refreshTree();
}
});
animation.play();
animationQueue.thenFinish(animation.getPromise());
};
AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) { AnimationFactory.prototype.overrideOpacityDepth2 = function(attr, opacity) {
opacity = (opacity === undefined) ? 1 : opacity; opacity = (opacity === undefined) ? 1 : opacity;

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

@ -274,8 +274,7 @@ GitEngine.prototype.makeOrigin = function(treeString) {
); );
originMaster.set('remote', true); originMaster.set('remote', true);
// add a simple refresh animation this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
}; };
GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) { GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {

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

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