diff options
| author | zeripath <art27@cantab.net> | 2020-07-02 11:46:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 11:46:06 +0100 |
| commit | 058ee52333e9fd445d082efb06e603e5c8359e7f (patch) | |
| tree | 31815f14b912b6122ba65edc321e064bce664491 /web_src/js/vendor | |
| parent | 47b1fc51496dd108bbe8f1ef34fc2a51c7901d98 (diff) | |
| download | gitea-058ee52333e9fd445d082efb06e603e5c8359e7f.tar.gz gitea-058ee52333e9fd445d082efb06e603e5c8359e7f.zip | |
Fix gitgraph branch continues after merge (#12044) (#12105)
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>
Diffstat (limited to 'web_src/js/vendor')
| -rw-r--r-- | web_src/js/vendor/gitgraph.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/web_src/js/vendor/gitgraph.js b/web_src/js/vendor/gitgraph.js index 0a780c1eb5..0cf5d0f75b 100644 --- a/web_src/js/vendor/gitgraph.js +++ b/web_src/js/vendor/gitgraph.js @@ -372,6 +372,10 @@ export default function gitGraph(canvas, rawGraphList, config) { inlineIntersect = false; } + if (colomn === '|' && currentRow[colomnIndex - 1] && currentRow[colomnIndex - 1] === '\\') { + flows.splice(colomnIndex, 0, genNewFlow()); + } + color = flows[colomnIndex].color; switch (colomn) { @@ -387,6 +391,9 @@ export default function gitGraph(canvas, rawGraphList, config) { break; case '|': + if (prevColomn && prevColomn === '\\') { + x += config.unitSize; + } drawLineUp(x, y, color); break; |