Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Fix gitgraph branch continues after merge (#12044) (#12105)

Browse source 
Backport #12044

* Fix gitgraph branch continues after merge

After fixing the initial problem in #11981 another
problem has come to light...

Fix #11981 (part 2)

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Update web_src/js/vendor/gitgraph.js

* Apply suggestions from code review

Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
zeripath 2020-07-02 11:46:06 +01:00 committed by GitHub
parent 47b1fc5149
commit 058ee52333
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
web_src/js/vendor/gitgraph.js vendored
View file

@ -372,6 +372,10 @@ export default function gitGraph(canvas, rawGraphList, config) {
inlineIntersect = false; inlineIntersect = false;
} }
if (colomn === '|' && currentRow[colomnIndex - 1] && currentRow[colomnIndex - 1] === '\\') {
flows.splice(colomnIndex, 0, genNewFlow());
}
color = flows[colomnIndex].color; color = flows[colomnIndex].color;
switch (colomn) { switch (colomn) {
@ -387,6 +391,9 @@ export default function gitGraph(canvas, rawGraphList, config) {
break; break;
case '|': case '|':
if (prevColomn && prevColomn === '\\') {
x += config.unitSize;
}
drawLineUp(x, y, color); drawLineUp(x, y, color);
break; break;