Split fmt_wiki_link into link_to_wiki and url_for_wiki

5 files changed, 26 insertions, 20 deletions

diff --git a/web/public/js/taginfo.js b/web/public/js/taginfo.js
index 42058bd..e9d42ee 100644
--- a/web/public/js/taginfo.js
+++ b/web/public/js/taginfo.js
@@ -85,6 +85,15 @@ function url_for_rtype(rtype) {
     }
 }
 
+function url_for_wiki(title, options) {
+    var path = 'http://wiki.openstreetmap.org/';
+    if (options && options.edit) {
+        return path + 'w/index.php?action=edit&title=' + encodeURIComponent(title);
+    } else {
+        return path + 'wiki/' + encodeURIComponent(title);
+    }
+}
+
 /* ============================ */
 
 var bad_chars_for_keys = '!"#$%&()*+,/;<=>?@[\\]^`{|}~' + "'";
@@ -193,6 +202,18 @@ function link_to_rtype(rtype, attr) {
     );
 }
 
+function link_to_wiki(title, options) {
+    if (title == '') {
+        return '';
+    }
+
+    return link(
+        url_for_wiki(title, options),
+        title,
+        { target: '_blank', 'class': 'extlink' }
+    );
+}
+
 /* ============================ */
 
 function tag(element, text, attrs) {
@@ -227,21 +248,6 @@ function hover_expand(text) {
 
 /* ============================ */
 
-function fmt_wiki_link(title, options) {
-    if (title == '') {
-        return '';
-    }
-
-    var path;
-    if (options && options.edit) {
-        path = 'w/index.php?action=edit&title=' + title;
-    } else {
-        path = 'wiki/' + title;
-    }
-
-    return link('http://wiki.openstreetmap.org/' + path, title, { target: '_blank', 'class': 'extlink' });
-}
-
 function fmt_img_popup(image) {
     var w = image.width,
         h = image.height,
@@ -257,7 +263,7 @@ function fmt_img_popup(image) {
         title = html_escape('<div class="img_popup" style="width: ' + thumb_size + 'px; height:' + other_size + 'px;"><img src="' + url + '"/></div>');
     }
 
-    return '<span class="overflow" tipsy_html="s" title="' + title + '">' + fmt_wiki_link(image.title) + '</span>';
+    return '<span class="overflow" tipsy_html="s" title="' + title + '">' + link_to_wiki(image.title) + '</span>';
 }
 
 function fmt_language(code, native_name, english_name) {
diff --git a/web/viewsjs/key.js.erb b/web/viewsjs/key.js.erb
index 8bbf631..4b76395 100644
--- a/web/viewsjs/key.js.erb
+++ b/web/viewsjs/key.js.erb
@@ -102,7 +102,7 @@ var create_flexigrid_for = {
                     rows: jQuery.map(data, function(row, i) {
                         return { 'cell': [
                             fmt_language(row.lang, row.language, row.language_en),
-                            fmt_wiki_link(row.title),
+                            link_to_wiki(row.title),
                             row.description,
                             row.image.title ? fmt_img_popup(row.image) : empty('<%= misc.no_image %>'),
                             fmt_type_icon('node',     row.on_node) + 
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 ead154c..0eac359 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
@@ -22,7 +22,7 @@ function create_flexigrid_with_option(english) {
         preProcess: function(data) {
             data.rows = jQuery.map(data.data, function(row, i) {
                 return { 'cell': [
-                    fmt_wiki_link('Key:' + row.key, { edit: true }),
+                    link_to_wiki('Key:' + row.key, { edit: true }),
                     link_to_key(row.key),
                     print_with_ts(row.count_all),
                     print_with_ts(row.users_all),
diff --git a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
index b19ab94..69330e7 100644
--- a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
+++ b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
@@ -21,7 +21,7 @@ function page_init() {
             data.rows = jQuery.map(data.data, function(row, i) {
                 var wikilinks = [];
                 jQuery(row.wikipages).each(function(i, wikipage) {
-                    var w = fmt_wiki_link(wikipage.title);
+                    var w = link_to_wiki(wikipage.title);
                     if (wikipage.type == 'redirect') {
                         w += ' (REDIRECT)';
                     }
diff --git a/web/viewsjs/tag.js.erb b/web/viewsjs/tag.js.erb
index d04a200..fe1e7fc 100644
--- a/web/viewsjs/tag.js.erb
+++ b/web/viewsjs/tag.js.erb
@@ -84,7 +84,7 @@ var create_flexigrid_for = {
                     rows: jQuery.map(data, function(row, i) {
                         return { 'cell': [
                             fmt_language(row.lang, row.language, row.language_en),
-                            fmt_wiki_link(row.title),
+                            link_to_wiki(row.title),
                             row.description,
                             row.image.title ? fmt_img_popup(row.image) : empty('<%= misc.no_image %>'),
                             fmt_type_icon('node',     row.on_node) +