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

[Origin] Makes two visualizations now and links the objects and small graphical updates

Browse source
This commit is contained in:
Peter Cottle 2013-05-26 16:34:54 -07:00
parent 5e151238c9
commit 91f0e13132
5 changed files with 180 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -297,7 +297,7 @@ var VisBranch = VisBase.extend({
var name = this.get('branch').getName();
var selected = this.get('branch') === this.gitEngine.HEAD.get('target');
var after = (selected) ? '*' : '';
var after = (selected && !this.getIsInOrigin()) ? '*' : '';
return name + after;
},
@ -435,7 +435,8 @@ var VisBranch = VisBase.extend({
var rectSize = this.getRectSize();
var arrowPath = this.getArrowPath();
var dashArray = (this.getIsRemote()) ? '--' : '';
var dashArray = (this.getIsRemote() || this.getIsInOrigin()) ?
GRAPHICS.originDash : '';
var cursorStyle = (this.shouldDisableClick()) ?
'auto' :
'pointer';
@ -457,7 +458,7 @@ var VisBranch = VisBase.extend({
opacity: nonTextOpacity,
fill: this.getFill(),
stroke: this.get('stroke'),
'stroke-dasharray': dashArray,
//'stroke-dasharray': dashArray,
'stroke-width': this.get('stroke-width')
},
arrow: {
@ -483,26 +484,7 @@ var VisBranch = VisBase.extend({
setAttr: function(attr, instant, speed, easing) {
var keys = ['text', 'rect', 'arrow'];
_.each(keys, function(key) {
if (instant) {
this.get(key).attr(attr[key]);
} else {
this.get(key).stop().animate(attr[key], speed, easing);
}
$(this.get(key).node).css(attr.css);
}, this);
},
animateToAttr: function(attr, speed, easing) {
if (speed === 0) {
this.setAttr(attr, /* instant */ true);
return;
}
var s = speed !== undefined ? speed : this.get('animationSpeed');
var e = easing || this.get('animationEasing');
this.setAttr(attr, /* instance */ false, s, e);
this.setAttrBase(keys, attr, instant, speed, easing);
}
});