More misc js cleanup

7 files changed, 21 insertions, 22 deletions

diff --git a/web/public/js/taginfo.js b/web/public/js/taginfo.js
index 307c508..c578fde 100644
--- a/web/public/js/taginfo.js
+++ b/web/public/js/taginfo.js
@@ -265,7 +265,11 @@ function hover_expand(text) {
 
 /* ============================ */
 
-function fmt_img_popup(image) {
+function fmt_wiki_image_popup(image) {
+    if (! image.title) {
+        return empty(texts.misc.no_image);
+    }
+
     var w = image.width,
         h = image.height,
         max_size = 180,
@@ -340,21 +344,16 @@ function fmt_josm_area(color) {
     });
 }
 
-function fmt_image(type) {
+function fmt_type_image(type) {
     type = type.replace(/s$/, '');
-    var name;
-    if (type == 'all') {
-        name = texts.misc.all;
-    } else {
-        name = texts.osm[type];
-    }
+    var name = html_escape(texts.osm[type]);
     return img({
         src: '/img/types/' + encodeURIComponent(type) + '.16.png',
-        alt: '[' + html_escape(name) + ']',
-        title: html_escape(name),
+        alt: '[' + name + ']',
+        title: name,
         width: 16,
         height: 16
-    });
+    }) + ' ' + name;
 }
 
 // format a number with thousand separator
diff --git a/web/viewsjs/index.js.erb b/web/viewsjs/index.js.erb
index 2d11329..f9404f2 100644
--- a/web/viewsjs/index.js.erb
+++ b/web/viewsjs/index.js.erb
@@ -88,18 +88,18 @@ function fill_lists() {
 
     while (key_list.outerHeight() < key_list_height) {
         var d = keys_data[i];
-        key_list.append('<li>' + link_to_key(d.text) + '</li>');
+        key_list.append(tag('li', link_to_key(d.text)));
         i++;
     }
-    key_list.append("<li>...</li>");
+    key_list.append(tag('li', '...'));
 
     i = 0;
     while (tag_list.outerHeight() < tag_list_height) {
         var d = tags_data[i];
-        tag_list.append('<li>' + link_to_tag(d[0], d[1]) + '</li>');
+        tag_list.append(tag('li', link_to_tag(d[0], d[1])));
         i++;
     }
-    tag_list.append("<li>...</li>");
+    tag_list.append(tag('li', '...'));
 }
 
 function page_init() {
diff --git a/web/viewsjs/key.js.erb b/web/viewsjs/key.js.erb
index c2bf6d6..6c89295 100644
--- a/web/viewsjs/key.js.erb
+++ b/web/viewsjs/key.js.erb
@@ -20,7 +20,7 @@ var create_flexigrid_for = {
                     page: 1,
                     rows: jQuery.map(data.data, function(row, i) {
                         return { 'cell': [
-                            fmt_image(row.type) + ' ' + texts.osm[row.type],
+                            fmt_type_image(row.type),
                             fmt_value_with_percent(row.count, row.count_fraction),
                             fmt_with_ts(row.values)
                         ]};
@@ -104,7 +104,7 @@ var create_flexigrid_for = {
                             fmt_language(row.lang, row.language, row.language_en),
                             link_to_wiki(row.title),
                             row.description,
-                            row.image.title ? fmt_img_popup(row.image) : empty('<%= misc.no_image %>'),
+                            fmt_wiki_image_popup(row.image),
                             fmt_type_icon('node',     row.on_node) + 
                             fmt_type_icon('way',      row.on_way) + 
                             fmt_type_icon('area',     row.on_area) + 
diff --git a/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb b/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
index 7380e3a..ace2de2 100644
--- a/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
+++ b/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
@@ -41,7 +41,6 @@ function page_init() {
     jQuery('#english').bind('click', function() {
         jQuery('#grid-keys').flexOptions({
             url: '/api/4/keys/without_wiki_page?english=' + (jQuery('#english')[0].checked ? '1' : '0')
-        });
-        jQuery('#grid-keys').flexReload();
+        }).flexReload();
     });
 }
diff --git a/web/viewsjs/reports/name_tags.js.erb b/web/viewsjs/reports/name_tags.js.erb
index bd672ed..7bf06ee 100644
--- a/web/viewsjs/reports/name_tags.js.erb
+++ b/web/viewsjs/reports/name_tags.js.erb
@@ -65,7 +65,7 @@ var create_flexigrid_for = {
                 data.rows = jQuery.map(data.data, function(row, i) {
                     return { 'cell': [
                         row.type,
-                        '<tt>' + row.subtag + '</tt>',
+                        tag('tt', row.subtag),
                         row.description,
                         row.added,
                         row.notes
diff --git a/web/viewsjs/tag.js.erb b/web/viewsjs/tag.js.erb
index 7d69eb2..85c168a 100644
--- a/web/viewsjs/tag.js.erb
+++ b/web/viewsjs/tag.js.erb
@@ -29,7 +29,7 @@ var create_flexigrid_for = {
                     page: 1,
                     rows: jQuery.map(data.data, function(row, i) {
                         return { 'cell': [
-                            fmt_image(row.type) + ' ' + texts.osm[row.type],
+                            fmt_type_image(row.type),
                             fmt_value_with_percent(row.count, row.count_fraction)
                         ]};
                     })
@@ -86,7 +86,7 @@ var create_flexigrid_for = {
                             fmt_language(row.lang, row.language, row.language_en),
                             link_to_wiki(row.title),
                             row.description,
-                            row.image.title ? fmt_img_popup(row.image) : empty('<%= misc.no_image %>'),
+                            fmt_wiki_image_popup(row.image),
                             fmt_type_icon('node',     row.on_node) + 
                             fmt_type_icon('way',      row.on_way) + 
                             fmt_type_icon('area',     row.on_area) + 
diff --git a/web/viewsjs/texts.js.erb b/web/viewsjs/texts.js.erb
index ec7cdb0..6da47ca 100644
--- a/web/viewsjs/texts.js.erb
+++ b/web/viewsjs/texts.js.erb
@@ -14,6 +14,7 @@ var texts = <%=
                 :empty_string => @trans.t.misc.empty_string,
                 :all => @trans.t.misc.all,
                 :search_for => @trans.t.misc.search_for,
+                :no_image => @trans.t.misc.no_image,
             },
             :osm => {
                 :key => @trans.t.osm.key,