From 1a75c61f658efd0df227b679f25c660f0b601715 Mon Sep 17 00:00:00 2001
From: rr- <rr-@sakuya.pl>
Date: Wed, 22 Jun 2016 23:12:34 +0200
Subject: [PATCH] client/tags: fix tag categories with spaces

---
 client/html/post_readonly_sidebar.tpl           | 4 ++--
 client/js/controls/tag_auto_complete_control.js | 7 ++++---
 client/js/controls/tag_input_control.js         | 5 ++++-
 client/js/tags.js                               | 4 +++-
 client/js/util/misc.js                          | 5 +++++
 client/js/util/views.js                         | 5 +++--
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/client/html/post_readonly_sidebar.tpl b/client/html/post_readonly_sidebar.tpl
index 0922e26d..6866216a 100644
--- a/client/html/post_readonly_sidebar.tpl
+++ b/client/html/post_readonly_sidebar.tpl
@@ -50,14 +50,14 @@
         --><% for (let tag of ctx.post.tags) { %><!--
             --><li><!--
                 --><% if (ctx.canViewTags) { %><!--
-                --><a href='/tag/<%= tag %>' class='tag-<%= ctx.getTagCategory(tag) %>'><!--
+                --><a href='/tag/<%= tag %>' class='<%= ctx.makeCssName(ctx.getTagCategory(tag), 'tag') %>'><!--
                     --><i class='fa fa-tag'></i><!--
                 --><% } %><!--
                 --><% if (ctx.canListPosts) { %><!--
                     --></a><!--
                 --><% } %><!--
                 --><% if (ctx.canListPosts) { %><!--
-                    --><a href='/posts/text=<%= tag %>' class='tag-<%= ctx.getTagCategory(tag) %>'><!--
+                    --><a href='/posts/text=<%= tag %>' class='<%= ctx.makeCssName(ctx.getTagCategory(tag), 'tag') %>'><!--
                 --><% } %><!--
                     --><%= tag %><!--
                 --><% if (ctx.canListPosts) { %><!--
diff --git a/client/js/controls/tag_auto_complete_control.js b/client/js/controls/tag_auto_complete_control.js
index a9fb7f0a..b54e4610 100644
--- a/client/js/controls/tag_auto_complete_control.js
+++ b/client/js/controls/tag_auto_complete_control.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const unindent = require('../util/misc.js').unindent;
 const tags = require('../tags.js');
+const misc = require('../util/misc.js');
 const AutoCompleteControl = require('./auto_complete_control.js');
 
 class TagAutoCompleteControl extends AutoCompleteControl {
@@ -31,9 +31,10 @@ class TagAutoCompleteControl extends AutoCompleteControl {
                     const category = kv[1].category;
                     const origName = tags.getOriginalTagName(kv[0]);
                     const usages = kv[1].usages;
+                    const cssName = misc.makeCssName(category, 'tag');
                     return {
-                        caption: unindent`
-                            <span class="tag-${category}">
+                        caption: misc.unindent`
+                            <span class="${cssName}">
                                 ${origName} (${usages})
                             </span>`,
                         value: kv[0],
diff --git a/client/js/controls/tag_input_control.js b/client/js/controls/tag_input_control.js
index 9edde1ea..17103793 100644
--- a/client/js/controls/tag_input_control.js
+++ b/client/js/controls/tag_input_control.js
@@ -2,6 +2,7 @@
 
 const api = require('../api.js');
 const tags = require('../tags.js');
+const misc = require('../util/misc.js');
 const views = require('../util/views.js');
 const TagAutoCompleteControl = require('./tag_auto_complete_control.js');
 
@@ -437,7 +438,9 @@ class TagInputControl {
             views.makeNonVoidElement(
                 'a',
                 {
-                    class: actualTag ? 'tag-' + actualTag.category : '',
+                    class: actualTag ?
+                        misc.makeCssName(actualTag.category, 'tag') :
+                        '',
                     href: '/tag/' + text,
                 },
                 text));
diff --git a/client/js/tags.js b/client/js/tags.js
index 59d508e0..f136bc28 100644
--- a/client/js/tags.js
+++ b/client/js/tags.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const misc = require('./util/misc.js');
 const request = require('superagent');
 
 let _tags = null;
@@ -63,8 +64,9 @@ function _refreshStylesheet() {
     _stylesheet = document.createElement('style');
     document.head.appendChild(_stylesheet);
     for (let category of getAllCategories()) {
+        const ruleName = misc.makeCssName(category.name, 'tag');
         _stylesheet.sheet.insertRule(
-            `.tag-${category.name} { color: ${category.color} }`,
+            `.${ruleName} { color: ${category.color} }`,
             _stylesheet.sheet.cssRules.length);
     }
 }
diff --git a/client/js/util/misc.js b/client/js/util/misc.js
index 1557d36c..e6bcdecd 100644
--- a/client/js/util/misc.js
+++ b/client/js/util/misc.js
@@ -220,6 +220,10 @@ function confirmPageExit() {
     }
 }
 
+function makeCssName(text, suffix) {
+    return suffix + '-' + text.replace(/[^a-z0-9]/g, '_');
+}
+
 module.exports = {
     range: range,
     formatSearchQuery: formatSearchQuery,
@@ -232,4 +236,5 @@ module.exports = {
     enableExitConfirmation: enableExitConfirmation,
     disableExitConfirmation: disableExitConfirmation,
     confirmPageExit: confirmPageExit,
+    makeCssName: makeCssName,
 };
diff --git a/client/js/util/views.js b/client/js/util/views.js
index 15472db7..ceb72d97 100644
--- a/client/js/util/views.js
+++ b/client/js/util/views.js
@@ -154,11 +154,11 @@ function makeTagLink(name) {
         makeNonVoidElement(
             'a', {
                 'href': '/tag/' + name,
-                'class': 'tag-' + category,
+                'class': misc.makeCssName(category, 'tag'),
             }, name) :
         makeNonVoidElement(
             'span', {
-                'class': 'tag-' + category,
+                'class': misc.makeCssName(category, 'tag'),
             },
             name);
 }
@@ -312,6 +312,7 @@ function getTemplate(templatePath) {
             makeUserLink: makeUserLink,
             makeFlexboxAlign: makeFlexboxAlign,
             makeAccessKey: makeAccessKey,
+            makeCssName: misc.makeCssName,
         });
         return htmlToDom(templateFactory(ctx));
     };