From 520a60d1bef5087a7a1315fb6718be9556b4bcd0 Mon Sep 17 00:00:00 2001
From: Maximilian Grundke <maximiliangrundke@googlemail.com>
Date: Sun, 13 Aug 2017 18:46:35 +0200
Subject: [PATCH] Use popovers with formatted comments instead of tooltips

---
 app/views/request_for_comments/show.html.erb | 27 +++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 6a21ca24..ce6f8d8e 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -153,18 +153,37 @@ also, all settings from the rails model needed for the editor configuration in t
     });
 
     jqrequest.done(function(response){
-      $.each(response, function(index, comment) {
-        comment.className = "code-ocean_comment";
+      var comments = response.slice().sort(function (a, b) {
+          return a.row > b.row;
+      });
+      while (comments.length > 0) {
+        var cluster = [];
+        var clusterRow = comments[0].row;
+        while (comments.length > 0 && comments[0].row === clusterRow) {
+          cluster.push(comments.shift());
+        }
+        var popupContent = '';
+        cluster.forEach(function(comment) {
+          popupContent += '<p><b>' + comment.username + '</b>: ' + comment.text.replace(/\n/g, '<br>') + '<p>';
+        });
+        var icon = $('*[data-file-id="' + fileid + '"] > .ace_gutter > .ace_gutter-layer > .ace_gutter-cell:contains("' + (clusterRow + 1) + '")');
+        icon.popover({
+          content: popupContent,
+          html: true,
+          trigger: 'hover',
+          container: 'body'
+        });
+      }
 
+      $.each(response, function(index, comment) {
+        comment.className = 'code-ocean_comment';
         // if we have tabs or carriage returns in the comment, just add the name and leave it as it is. otherwise: format!
         if(comment.text.includes("\n") || comment.text.includes("\t")){
           comment.text = comment.username + ": " + comment.text;
         } else {
           comment.text = comment.username + ": " + stringDivider(comment.text, 80, "\n");
         }
-
       });
-
       session.setAnnotations(response);
     })
   }