diffs: fixed selecting active lines in both types of diffs.

rhodecode/public/css/code-block.less

@@ -1132,6 +1132,9 b' table.cb {'
             .icon-comment {
                 cursor: pointer;
             }
+            &.cb-line-selected {
+                background: @comment-highlight-color !important;
+            }
             &.cb-line-selected > div {
                 display: block;
                 background: @comment-highlight-color !important;
@@ -1154,7 +1157,7 b' table.cb {'
             a::before {
                 content: attr(data-line-no);
             }
-            &.cb-line-selected a {
+            &.cb-line-selected {
                 background: @comment-highlight-color !important;
             }
 

rhodecode/public/js/src/rhodecode.js

@@ -295,24 +295,25 b' function scrollToElement(element, percen'
     });
 
     $('body').on('click', '.cb-lineno a', function(event) {
-
             function sortNumber(a,b) {
                 return a - b;
             }
 
             var lineNo = $(this).data('lineNo');
+        var lineName = $(this).attr('name');
+
             if (lineNo) {
+            var prevLine = $('.cb-line-selected a').data('lineNo');
 
                 // on shift, we do a range selection, if we got previous line
-                var prevLine = $('.cb-line-selected a').data('lineNo');
                 if (event.shiftKey && prevLine !== undefined) {
                     var prevLine = parseInt(prevLine);
                     var nextLine = parseInt(lineNo);
                     var pos = [prevLine, nextLine].sort(sortNumber);
                     var anchor = '#L{0}-{1}'.format(pos[0], pos[1]);
 
+            // single click
                 } else {
-
                     var nextLine = parseInt(lineNo);
                     var pos = [nextLine, nextLine];
                     var anchor = '#L{0}'.format(pos[0]);
@@ -323,11 +324,12 b' function scrollToElement(element, percen'
                 for (var i = pos[0]; i <= pos[1]; i++) {
                     range.push(i);
                 }
-                // clear selection
+            // clear old selected lines
                 $('.cb-line-selected').removeClass('cb-line-selected');
 
                 $.each(range, function (i, lineNo) {
                     var line_td = $('td.cb-lineno#L' + lineNo);
+
                     if (line_td.length) {
                         line_td.addClass('cb-line-selected'); // line number td
                         line_td.prev().addClass('cb-line-selected'); // line data
@@ -335,15 +337,20 b' function scrollToElement(element, percen'
                     }
                 });
 
-
-            } else {
-                if ($(this).attr('name') !== undefined) {
-                    // clear selection
+        } else if (lineName !== undefined) { // lineName only occurs in diffs
+            // clear old selected lines
                     $('td.cb-line-selected').removeClass('cb-line-selected');
-                    var aEl = $(this).closest('td');
-                    aEl.addClass('cb-line-selected');
-                    aEl.next('td').addClass('cb-line-selected');
+            var anchor = '#{0}'.format(lineName);
+            var diffmode = templateContext.session_attrs.diffmode || "sideside";
+
+            if (diffmode === "unified") {
+                $(this).closest('tr').find('td').addClass('cb-line-selected');
+            } else {
+                var activeTd = $(this).closest('td');
+                activeTd.addClass('cb-line-selected');
+                activeTd.next('td').addClass('cb-line-selected');
                 }
+
             }
 
             // Replace URL without jumping to it if browser supports.
@@ -364,7 +371,6 b' function scrollToElement(element, percen'
 
         });
 
-
     $('.collapse_file').on('click', function(e) {
         e.stopPropagation();
         if ($(e.target).is('a')) { return; }