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

ugly ugly bug with circular fields

Browse source
This commit is contained in:
Peter Cottle 2013-10-06 15:12:21 -07:00
parent 1ed8a2524a
commit bbf837a4b2
6 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,6 +138,9 @@ AnimationFactory.refreshTree = function(animationQueue, gitVisuals) {
AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) {
// could be branch or node
var visObj = destObj.get('visBranch') || destObj.get('visNode');
if (!visObj) {
debugger;
}
var visNode = commit.get('visNode');
return new PromiseAnimation(makeHighlightAnimation(visNode, visObj));
};

6
src/js/visuals/visBranch.js
View file

@ -60,6 +60,12 @@ var VisBranch = VisBase.extend({
}
this.get('branch').set('visBranch', this);
if (this.get('branch').get('id') === 'o/master') {
console.log('set visbranch on this', this.get('branch'), this);
window.debugVisBranch = this;
window.debugBranch = this.get('branch');
debugger;
}
var id = this.get('branch').get('id');
if (id == 'HEAD') {

3
src/js/visuals/visNode.js
View file

@ -141,9 +141,6 @@ var VisNode = VisBase.extend({
},
highlightTo: function(visObj, speed, easing) {
if (!visObj) {
debugger;
}
// a small function to highlight the color of a node for demonstration purposes
var color = visObj.get('fill');