Javascript helper function cleanup

3 files changed, 32 insertions, 4 deletions

diff --git a/web/viewsjs/reports/name_tags.js.erb b/web/viewsjs/reports/name_tags.js.erb
index 07b78cc..62b953e 100644
--- a/web/viewsjs/reports/name_tags.js.erb
+++ b/web/viewsjs/reports/name_tags.js.erb
@@ -2,6 +2,10 @@
     osm = @trans.t.osm
     misc = @trans.t.misc
  %>
+function tt(text, c, title) {
+    return tag('tt', text, { 'class': c, 'title': title, 'tipsy': 'w' });
+}
+
 var create_flexigrid_for = {
     "overview": function() {
         create_flexigrid('grid-name', {
diff --git a/web/viewsjs/search.js.erb b/web/viewsjs/search.js.erb
index 5c51364..aa717b5 100644
--- a/web/viewsjs/search.js.erb
+++ b/web/viewsjs/search.js.erb
@@ -3,6 +3,20 @@
     misc = @trans.t.misc
     search = @trans.t.pages.search
  %>
+function link_to_key_with_highlight(key, highlight) {
+    return link(
+        url_for_key(key),
+        key.replace(new RegExp('(' + highlight + ')', 'gi'), "<b>$1</b>")
+    );
+}
+
+function link_to_value_with_highlight(key, value, highlight) {
+    return link(
+        url_for_tag(key, value), 
+        value.replace(new RegExp('(' + highlight + ')', 'gi'), "<b>$1</b>")
+    );
+}
+
 var create_flexigrid_for = {
     keys: function(query) {
         create_flexigrid('grid-keys', {
@@ -17,7 +31,7 @@ var create_flexigrid_for = {
                 data.rows = jQuery.map(data.data, function(row, i) {
                     return { 'cell': [
                         print_with_ts(row.count_all),
-                        link_to_key(row.key, query)
+                        link_to_key_with_highlight(row.key, query)
                     ] };
                 });
                 return data;
@@ -39,7 +53,7 @@ var create_flexigrid_for = {
                     return { 'cell': [
                         print_with_ts(row.count_all),
                         link_to_key(row.key),
-                        link_to_value(row.key, row.value, query)
+                        link_to_value_with_highlight(row.key, row.value, query)
                     ] };
                 });
                 return data;
@@ -61,8 +75,8 @@ var create_flexigrid_for = {
                 data.rows = jQuery.map(data.data, function(row, i) {
                     return { 'cell': [
                         print_with_ts(row.count_all),
-                        link_to_key(row.key, q[0]),
-                        link_to_value(row.key, row.value, q[1])
+                        link_to_key_with_highlight(row.key, q[0]),
+                        link_to_value_with_highlight(row.key, row.value, q[1])
                     ] };
                 });
                 return data;
diff --git a/web/viewsjs/tag.js.erb b/web/viewsjs/tag.js.erb
index 9ce2474..20852b3 100644
--- a/web/viewsjs/tag.js.erb
+++ b/web/viewsjs/tag.js.erb
@@ -3,6 +3,16 @@
     misc = @trans.t.misc
     page = @trans.t.pages.tag
  %>
+function link_to_key_or_tag(key, value) {
+    var link = link_to_key(key) + '=';
+    if (value && value != '') {
+        link += link_to_value(key, value);
+    } else {
+        link += '*';
+    }
+    return link;
+}
+
 var create_flexigrid_for = {
     overview: function(key, value, filter_type) {
         create_flexigrid('grid-overview', {