diff --git a/src/animationFactory.js b/src/animationFactory.js index 95c3aab4..51d73008 100644 --- a/src/animationFactory.js +++ b/src/animationFactory.js @@ -30,6 +30,7 @@ AnimationFactory.prototype.genCommitBirthAnimation = function(animationQueue, co visNode.setBirth(); visNode.parentInFront(); + gitVisuals.visBranchesFront(); visNode.animateUpdatedPosition(bounceTime, 'bounce'); visNode.animateOutgoingEdges(time); diff --git a/src/commandViews.js b/src/commandViews.js index 17ebc07a..d4e7fb93 100644 --- a/src/commandViews.js +++ b/src/commandViews.js @@ -30,7 +30,6 @@ var CommandPromptView = Backbone.View.extend({ }, blur: function() { - console.log('got blur'); $(this.commandCursor).toggleClass('shown', false); }, diff --git a/src/tree.js b/src/tree.js index ce082d6c..f0d420d3 100644 --- a/src/tree.js +++ b/src/tree.js @@ -140,7 +140,7 @@ var VisBranch = Backbone.Model.extend({ -this.get('arrowEdgeHeight') ); - var tailLength = 30; + var tailLength = 45; var arrowStartUp = offset2d(arrowInnerUp, f * tailLength, 0); var arrowStartLow = offset2d(arrowInnerLow, f * tailLength, 0); diff --git a/src/visuals.js b/src/visuals.js index 68aabae9..b3629673 100644 --- a/src/visuals.js +++ b/src/visuals.js @@ -381,10 +381,17 @@ GitVisuals.prototype.collectionChanged = function() { }; GitVisuals.prototype.zIndexReflow = function() { + this.visNodesFront(); + this.visBranchesFront(); +}; + +GitVisuals.prototype.visNodesFront = function() { _.each(this.visNodeMap, function(visNode) { visNode.toFront(); }); +}; +GitVisuals.prototype.visBranchesFront = function() { this.visBranchCollection.each(function(vBranch) { vBranch.nonTextToFront(); }); diff --git a/todo.txt b/todo.txt index b85a8ace..2c9c187a 100644 --- a/todo.txt +++ b/todo.txt @@ -8,9 +8,21 @@ animation factory? stuff like: ALSO other big things: -- Text on commit nodes - Division in their rings based on how many / what branches they are part of - Color on branch edges?? - sizing on visedge arrowheads, also fill most likely + +Small things to implement: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +- Git show +- Git show when you click on a node (or the text technically) + + +Bugs to fix: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- When you are rebasing and you hit the bottom, all the nodes go in the wrong spot... + We need some kind of "update everything but this set of nodes" thing... +