Fix gitgraph branch continues after merge (#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 <[email protected]> * Update web_src/js/vendor/gitgraph.js * Apply suggestions from code review Co-authored-by: silverwind <[email protected]> Co-authored-by: silverwind <[email protected]> Co-authored-by: techknowlogick <[email protected]>
go-gitea · Jun 25, 2020 · 0b1bb96 · 0b1bb96
1 parent ebc35f2
commit 0b1bb96
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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;