Merge branch 'qistoph-RegexTooltip'

gchq · Oct 12, 2018 · 5155d0e · 5155d0e
2 parents 8f7bb3a + 9be6741
commit 5155d0e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/core/operations/RegularExpression.mjs b/src/core/operations/RegularExpression.mjs
@@ -227,6 +227,7 @@ function regexList (input, regex, displayTotal, matches, captureGroups) {
  */
 function regexHighlight (input, regex, displayTotal) {
     let output = "",
+        title = "",
         m,
         hl = 1,
         i = 0,
@@ -241,8 +242,16 @@ function regexHighlight (input, regex, displayTotal) {
         // Add up to match
         output += Utils.escapeHtml(input.slice(i, m.index));
 
+        title = `Offset: ${m.index}\n`;
+        if (m.length > 1) {
+            title += "Groups:\n";
+            for (let n = 1; n < m.length; ++n) {
+                title += `\t${n}: ${m[n]}\n`;
+            }
+        }
+
         // Add match with highlighting
-        output += "<span class='hl"+hl+"'>" + Utils.escapeHtml(m[0]) + "</span>";
+        output += "<span class='hl"+hl+"' title='"+title+"'>" + Utils.escapeHtml(m[0]) + "</span>";
 
         // Switch highlight
         hl = hl === 1 ? 2 : 1;