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] Implement basic git fetch force need to fix up animations

Browse source
This commit is contained in:
Peter Cottle 2013-05-26 23:44:07 -07:00
parent 3a23973a9a
commit 6080d324ce
9 changed files with 468 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,11 +87,7 @@ var VisBranch = VisBase.extend({
// easy logic first
if (!this.get('isHead')) {
if (this.getIsRemote()) {
return (overThreshold) ? 1 : -1;
} else {
return (overThreshold) ? -1 : 1;
}
return (overThreshold) ? -1 : 1;
}
// now for HEAD....
@ -296,8 +292,9 @@ var VisBranch = VisBase.extend({
getName: function() {
var name = this.get('branch').getName();
var selected = this.get('branch') === this.gitEngine.HEAD.get('target');
var isRemote = this.getIsRemote();
var after = (selected && !this.getIsInOrigin()) ? '*' : '';
var after = (selected && !this.getIsInOrigin() && !isRemote) ? '*' : '';
return name + after;
},
@ -435,7 +432,7 @@ var VisBranch = VisBase.extend({
var rectSize = this.getRectSize();
var arrowPath = this.getArrowPath();
var dashArray = (this.getIsRemote() || this.getIsInOrigin()) ?
var dashArray = (this.getIsInOrigin()) ?
GRAPHICS.originDash : '';
var cursorStyle = (this.shouldDisableClick()) ?
'auto' :