Mark current branch tag

onlywei · Aug 25, 2017 · 1631f8d · 1631f8d
1 parent f29b993
commit 1631f8d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/css/explaingit.css b/css/explaingit.css
@@ -228,6 +228,12 @@ g.branch-tag > rect {
 	stroke-width: 2;
 }
 
+g.branch-tag.current-branch > rect {
+	fill: #FFCC66;
+	stroke: #339900;
+	stroke-width: 2;
+}
+
 g.branch-tag.git-tag > rect {
 	fill: #7FC9FF;
 	stroke: #0026FF;

diff --git a/js/historyview.js b/js/historyview.js
@@ -669,7 +669,8 @@ define(['d3'], function () {
         renderTags: function () {
             var view = this,
                 tagData = this._parseTagData(),
-                existingTags, newTags;
+                existingTags, newTags,
+                currentBranch = this.currentBranch;
 
             existingTags = this.tagBox.selectAll('g.branch-tag')
                 .data(tagData, function (d) { return d.name; });
@@ -707,6 +708,9 @@ define(['d3'], function () {
                     } else if (d.name.toUpperCase() === 'HEAD') {
                         classes += ' head-tag';
                     }
+                    if (d.name == currentBranch) {
+                        classes += " current-branch"
+                    }
                     return classes;
                 });
 
@@ -737,6 +741,19 @@ define(['d3'], function () {
                     return commit.cx;
                 });
 
+            this.tagBox.selectAll('g.branch-tag').attr('class', function(d) {
+                var cls = d3.select(this).attr('class').split(" "),
+                    currentBranchIndex = cls.indexOf('current-branch');
+                if (d.name == currentBranch) {
+                    if (currentBranchIndex < 0) {
+                        cls.push('current-branch');
+                    }
+                } else if (currentBranchIndex >= 0) {
+                    cls.splice(currentBranchIndex, 1);
+                }
+                return cls.join(' ');
+            });
+
             this._markBranchlessCommits();
         },