mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-29 09:20:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

visuals down for non essential branches

Browse source
This commit is contained in:
Peter Cottle 2013-07-07 20:44:46 -07:00
parent 264f245275
commit 19f204ddcb
2 changed files with 99 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

82
build/bundle.js
View file

@ -17140,8 +17140,7 @@ var VisBranch = VisBase.extend({
if (!this.get('gitVisuals').getIsGoalVis()) {
return '';
}
return (this.getIsLevelBranchCompared()) ? '' : '- ';
return (this.getIsLevelBranchCompared()) ? '' : '--';
},
getIsGoalAndNotCompared: function() {
@ -17520,6 +17519,24 @@ var VisBranch = VisBase.extend({
});
},
getArrowOpacity: function() {
if (this.getIsGoalAndNotCompared() &&
!this.get('isHead') &&
this.getBranchStackIndex() === 0) {
return 0.5;
}
return this.getNonTextOpacity();
},
getRectOpacity: function() {
if (this.getIsGoalAndNotCompared() &&
!this.get('isHead') &&
this.getBranchStackIndex() === 0) {
return 0.8;
}
return this.getNonTextOpacity();
},
getNonTextOpacity: function() {
if (this.get('isHead')) {
return this.gitEngine.getDetachedHead() ? 1 : 0;
@ -17537,14 +17554,21 @@ var VisBranch = VisBase.extend({
}
if (this.getIsGoalAndNotCompared()) {
return 0.3;
return (this.getBranchStackIndex() === 0) ? 0.7 : 0.3;
}
return 1;
},
getStrokeWidth: function() {
if (this.getIsGoalAndNotCompared()) {
return this.get('stroke-width') / 5.0;
}
return this.get('stroke-width');
},
getAttributes: function() {
var nonTextOpacity = this.getNonTextOpacity();
var textOpacity = this.getTextOpacity();
this.updateName();
@ -17572,19 +17596,20 @@ var VisBranch = VisBase.extend({
y: rectPos.y,
width: rectSize.w,
height: rectSize.h,
opacity: nonTextOpacity,
opacity: this.getRectOpacity(),
fill: this.getFill(),
stroke: this.get('stroke'),
'stroke-dasharray': dashArray,
'stroke-width': this.get('stroke-width')
'stroke-width': this.getStrokeWidth()
},
arrow: {
path: arrowPath,
opacity: nonTextOpacity,
opacity: this.getArrowOpacity(),
fill: this.getFill(),
stroke: this.get('stroke'),
transform: this.getArrowTransform(),
'stroke-width': this.get('stroke-width')
'stroke-dasharray': dashArray,
'stroke-width': this.getStrokeWidth()
}
};
},
@ -33744,8 +33769,7 @@ var VisBranch = VisBase.extend({
if (!this.get('gitVisuals').getIsGoalVis()) {
return '';
}
return (this.getIsLevelBranchCompared()) ? '' : '- ';
return (this.getIsLevelBranchCompared()) ? '' : '--';
},
getIsGoalAndNotCompared: function() {
@ -34124,6 +34148,24 @@ var VisBranch = VisBase.extend({
});
},
getArrowOpacity: function() {
if (this.getIsGoalAndNotCompared() &&
!this.get('isHead') &&
this.getBranchStackIndex() === 0) {
return 0.5;
}
return this.getNonTextOpacity();
},
getRectOpacity: function() {
if (this.getIsGoalAndNotCompared() &&
!this.get('isHead') &&
this.getBranchStackIndex() === 0) {
return 0.8;
}
return this.getNonTextOpacity();
},
getNonTextOpacity: function() {
if (this.get('isHead')) {
return this.gitEngine.getDetachedHead() ? 1 : 0;
@ -34141,14 +34183,21 @@ var VisBranch = VisBase.extend({
}
if (this.getIsGoalAndNotCompared()) {
return 0.3;
return (this.getBranchStackIndex() === 0) ? 0.7 : 0.3;
}
return 1;
},
getStrokeWidth: function() {
if (this.getIsGoalAndNotCompared()) {
return this.get('stroke-width') / 5.0;
}
return this.get('stroke-width');
},
getAttributes: function() {
var nonTextOpacity = this.getNonTextOpacity();
var textOpacity = this.getTextOpacity();
this.updateName();
@ -34176,19 +34225,20 @@ var VisBranch = VisBase.extend({
y: rectPos.y,
width: rectSize.w,
height: rectSize.h,
opacity: nonTextOpacity,
opacity: this.getRectOpacity(),
fill: this.getFill(),
stroke: this.get('stroke'),
'stroke-dasharray': dashArray,
'stroke-width': this.get('stroke-width')
'stroke-width': this.getStrokeWidth()
},
arrow: {
path: arrowPath,
opacity: nonTextOpacity,
opacity: this.getArrowOpacity(),
fill: this.getFill(),
stroke: this.get('stroke'),
transform: this.getArrowTransform(),
'stroke-width': this.get('stroke-width')
'stroke-dasharray': dashArray,
'stroke-width': this.getStrokeWidth()
}
};
},

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

@ -88,8 +88,7 @@ var VisBranch = VisBase.extend({
if (!this.get('gitVisuals').getIsGoalVis()) {
return '';
}
return (this.getIsLevelBranchCompared()) ? '' : '- ';
return (this.getIsLevelBranchCompared()) ? '' : '--';
},
getIsGoalAndNotCompared: function() {
@ -468,6 +467,24 @@ var VisBranch = VisBase.extend({
});
},
getArrowOpacity: function() {
if (this.getIsGoalAndNotCompared() &&
!this.get('isHead') &&
this.getBranchStackIndex() === 0) {
return 0.5;
}
return this.getNonTextOpacity();
},
getRectOpacity: function() {
if (this.getIsGoalAndNotCompared() &&
!this.get('isHead') &&
this.getBranchStackIndex() === 0) {
return 0.8;
}
return this.getNonTextOpacity();
},
getNonTextOpacity: function() {
if (this.get('isHead')) {
return this.gitEngine.getDetachedHead() ? 1 : 0;
@ -485,14 +502,21 @@ var VisBranch = VisBase.extend({
}
if (this.getIsGoalAndNotCompared()) {
return 0.3;
return (this.getBranchStackIndex() === 0) ? 0.7 : 0.3;
}
return 1;
},
getStrokeWidth: function() {
if (this.getIsGoalAndNotCompared()) {
return this.get('stroke-width') / 5.0;
}
return this.get('stroke-width');
},
getAttributes: function() {
var nonTextOpacity = this.getNonTextOpacity();
var textOpacity = this.getTextOpacity();
this.updateName();
@ -520,19 +544,20 @@ var VisBranch = VisBase.extend({
y: rectPos.y,
width: rectSize.w,
height: rectSize.h,
opacity: nonTextOpacity,
opacity: this.getRectOpacity(),
fill: this.getFill(),
stroke: this.get('stroke'),
'stroke-dasharray': dashArray,
'stroke-width': this.get('stroke-width')
'stroke-width': this.getStrokeWidth()
},
arrow: {
path: arrowPath,
opacity: nonTextOpacity,
opacity: this.getArrowOpacity(),
fill: this.getFill(),
stroke: this.get('stroke'),
transform: this.getArrowTransform(),
'stroke-width': this.get('stroke-width')
'stroke-dasharray': dashArray,
'stroke-width': this.getStrokeWidth()
}
};
},