summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorHunternif <hunternif@gmail.com>2021-08-07 01:55:01 +0100
committerHunternif <hunternif@gmail.com>2021-08-07 01:55:01 +0100
commitb703ee610af5dd7f007ea3b274466891a7bef5eb (patch)
tree067d13e8b0352511ca6eadc2174800f74aab7df9 /client
parent071166808fa6a7bd680210d28a104f8bf82ce567 (diff)
client: fix errors after merge (escapeTagName)
Diffstat (limited to 'client')
-rw-r--r--client/html/compact_metric_list_item.tpl4
-rw-r--r--client/html/compact_post_metric_list_item.tpl8
-rw-r--r--client/html/compact_post_metric_range_list_item.tpl8
-rw-r--r--client/js/util/views.js2
4 files changed, 11 insertions, 11 deletions
diff --git a/client/html/compact_metric_list_item.tpl b/client/html/compact_metric_list_item.tpl
index 5f2ae36..ddddc33 100644
--- a/client/html/compact_metric_list_item.tpl
+++ b/client/html/compact_metric_list_item.tpl
@@ -5,9 +5,9 @@
--><i class='fa fa-sliders-h tag-icon'></i><!--
--></a><!--
--><a href="<%- ctx.formatClientLink('posts', {
- query: 'metric-' + ctx.escapeColons(ctx.tag.names[0]) +
+ query: 'metric-' + ctx.escapeTagName(ctx.tag.names[0]) +
':' + ctx.tag.metric.min + '..' + ctx.tag.metric.max +
- ' sort:metric-' + ctx.escapeColons(ctx.tag.names[0])
+ ' sort:metric-' + ctx.escapeTagName(ctx.tag.names[0])
}) %>"
class="<%= ctx.makeCssName(ctx.tag.category, 'tag') %>"><!--
--><%- ctx.tag.names[0] %>&#32;<!--
diff --git a/client/html/compact_post_metric_list_item.tpl b/client/html/compact_post_metric_list_item.tpl
index b8d8336..aa6da3f 100644
--- a/client/html/compact_post_metric_list_item.tpl
+++ b/client/html/compact_post_metric_list_item.tpl
@@ -2,9 +2,9 @@
--><% if (ctx.editMode) { %><!--
--><a href class='remove-metric' data-pseudo-content='×'/><!--
--><a href="<%- ctx.formatClientLink('posts', {
- query: 'metric-' + ctx.escapeColons(ctx.tag.names[0]) +
+ query: 'metric-' + ctx.escapeTagName(ctx.tag.names[0]) +
':' + ctx.tag.metric.min + '..' + ctx.tag.metric.max +
- ' sort:metric-' + ctx.escapeColons(ctx.tag.names[0])
+ ' sort:metric-' + ctx.escapeTagName(ctx.tag.names[0])
}) %>"
class="<%= ctx.makeCssName(ctx.tag.category, 'tag') %>"><!--
--><i class='fas fa-angle-right tag-icon'></i><!--
@@ -22,9 +22,9 @@
--><i class='fas fa-angle-right tag-icon'></i><!--
--></a><!--
--><a href="<%- ctx.formatClientLink('posts', {
- query: 'metric-' + ctx.escapeColons(ctx.tag.names[0]) +
+ query: 'metric-' + ctx.escapeTagName(ctx.tag.names[0]) +
':' + ctx.tag.metric.min + '..' + ctx.tag.metric.max +
- ' sort:metric-' + ctx.escapeColons(ctx.tag.names[0])
+ ' sort:metric-' + ctx.escapeTagName(ctx.tag.names[0])
}) %>"
class="<%= ctx.makeCssName(ctx.tag.category, 'tag') %>"><!--
--><%- ctx.postMetric.tagName %>: <%- ctx.postMetric.value || 0 %></a><!--
diff --git a/client/html/compact_post_metric_range_list_item.tpl b/client/html/compact_post_metric_range_list_item.tpl
index ba91a57..fd4c40e 100644
--- a/client/html/compact_post_metric_range_list_item.tpl
+++ b/client/html/compact_post_metric_range_list_item.tpl
@@ -2,9 +2,9 @@
--><% if (ctx.editMode) { %><!--
--><a class='remove-metric' data-pseudo-content='×'/><!--
--><a href="<%- ctx.formatClientLink('posts', {
- query: 'metric-' + ctx.escapeColons(ctx.tag.names[0]) +
+ query: 'metric-' + ctx.escapeTagName(ctx.tag.names[0]) +
':' + ctx.tag.metric.min + '..' + ctx.tag.metric.max +
- ' sort:metric-' + ctx.escapeColons(ctx.tag.names[0])
+ ' sort:metric-' + ctx.escapeTagName(ctx.tag.names[0])
}) %>"
class="<%= ctx.makeCssName(ctx.tag.category, 'tag') %>"><!--
--><i class='fas fa-arrows-alt-h tag-icon'></i><!--
@@ -30,9 +30,9 @@
--><i class='fas fa-arrows-alt-h tag-icon'></i><!--
--></a><!--
--><a href="<%- ctx.formatClientLink('posts', {
- query: 'metric-' + ctx.escapeColons(ctx.tag.names[0]) +
+ query: 'metric-' + ctx.escapeTagName(ctx.tag.names[0]) +
':' + ctx.tag.metric.min + '..' + ctx.tag.metric.max +
- ' sort:metric-' + ctx.escapeColons(ctx.tag.names[0])
+ ' sort:metric-' + ctx.escapeTagName(ctx.tag.names[0])
}) %>"
class="<%= ctx.makeCssName(ctx.tag.category, 'tag') %>"><!--
--><%- ctx.postMetricRange.tagName %>:
diff --git a/client/js/util/views.js b/client/js/util/views.js
index bc83153..cc0614b 100644
--- a/client/js/util/views.js
+++ b/client/js/util/views.js
@@ -482,7 +482,7 @@ function getTemplate(templatePath) {
makeCssName: misc.makeCssName,
makeNumericInput: makeNumericInput,
formatClientLink: uri.formatClientLink,
- escapeColons: uri.escapeColons,
+ escapeTagName: uri.escapeTagName,
});
return htmlToDom(templateFactory(ctx));
};