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

bt now weirdly the animation deonst fire at first, look into it

Browse source
This commit is contained in:
Peter Cottle 2013-06-02 17:45:34 -07:00
parent b69c35d548
commit 19c0ee0ef4
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build/bundle.js
View file

@ -7306,14 +7306,14 @@ GitEngine.prototype.makeOrigin = function(treeString) {
}); });
// defer the starting of our animation until origin has been created // defer the starting of our animation until origin has been created
this.animationQueue.set('defer', true); this.animationQueue.set('promiseBased', true);
originVis.customEvents.on('gitEngineReady', function() { originVis.customEvents.on('gitEngineReady', function() {
this.origin = originVis.gitEngine; this.origin = originVis.gitEngine;
originVis.gitEngine.assignLocalRepo(this); originVis.gitEngine.assignLocalRepo(this);
// and then here is the crazy part -- we need the ORIGIN to refresh // and then here is the crazy part -- we need the ORIGIN to refresh
// itself in a separate animation. @_____@ // itself in a separate animation. @_____@
this.origin.externalRefresh(); this.origin.externalRefresh();
this.animationQueue.start(); this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
}, this); }, this);
// TODO handle the case where the master target on origin is not present // TODO handle the case where the master target on origin is not present
@ -7326,8 +7326,6 @@ GitEngine.prototype.makeOrigin = function(treeString) {
this.getCommitFromRef(originMasterTarget) this.getCommitFromRef(originMasterTarget)
); );
originMaster.set('remote', true); originMaster.set('remote', true);
this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
}; };
GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) { GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {
@ -23238,14 +23236,14 @@ GitEngine.prototype.makeOrigin = function(treeString) {
}); });
// defer the starting of our animation until origin has been created // defer the starting of our animation until origin has been created
this.animationQueue.set('defer', true); this.animationQueue.set('promiseBased', true);
originVis.customEvents.on('gitEngineReady', function() { originVis.customEvents.on('gitEngineReady', function() {
this.origin = originVis.gitEngine; this.origin = originVis.gitEngine;
originVis.gitEngine.assignLocalRepo(this); originVis.gitEngine.assignLocalRepo(this);
// and then here is the crazy part -- we need the ORIGIN to refresh // and then here is the crazy part -- we need the ORIGIN to refresh
// itself in a separate animation. @_____@ // itself in a separate animation. @_____@
this.origin.externalRefresh(); this.origin.externalRefresh();
this.animationQueue.start(); this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
}, this); }, this);
// TODO handle the case where the master target on origin is not present // TODO handle the case where the master target on origin is not present
@ -23258,8 +23256,6 @@ GitEngine.prototype.makeOrigin = function(treeString) {
this.getCommitFromRef(originMasterTarget) this.getCommitFromRef(originMasterTarget)
); );
originMaster.set('remote', true); originMaster.set('remote', true);
this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
}; };
GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) { GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {

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

@ -253,14 +253,14 @@ GitEngine.prototype.makeOrigin = function(treeString) {
}); });
// defer the starting of our animation until origin has been created // defer the starting of our animation until origin has been created
this.animationQueue.set('defer', true); this.animationQueue.set('promiseBased', true);
originVis.customEvents.on('gitEngineReady', function() { originVis.customEvents.on('gitEngineReady', function() {
this.origin = originVis.gitEngine; this.origin = originVis.gitEngine;
originVis.gitEngine.assignLocalRepo(this); originVis.gitEngine.assignLocalRepo(this);
// and then here is the crazy part -- we need the ORIGIN to refresh // and then here is the crazy part -- we need the ORIGIN to refresh
// itself in a separate animation. @_____@ // itself in a separate animation. @_____@
this.origin.externalRefresh(); this.origin.externalRefresh();
this.animationQueue.start(); this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
}, this); }, this);
// TODO handle the case where the master target on origin is not present // TODO handle the case where the master target on origin is not present
@ -273,8 +273,6 @@ GitEngine.prototype.makeOrigin = function(treeString) {
this.getCommitFromRef(originMasterTarget) this.getCommitFromRef(originMasterTarget)
); );
originMaster.set('remote', true); originMaster.set('remote', true);
this.animationFactory.playRefreshAnimationAndFinish(this.gitVisuals, this.animationQueue);
}; };
GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) { GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {