snuffster/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client/pools: inherit option to show underscores as spaces

Browse source
This commit is contained in:
Shyam Sunder 2020-06-23 12:36:26 -04:00
parent 029c112011
commit d420609f97
10 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/html/pool.tpl
View file

@ -1,5 +1,5 @@
<div class='content-wrapper' id='pool'>
<h1><%- ctx.pool.names[0] %></h1>
<h1><%- ctx.getPrettyName(ctx.pool.names[0]) %></h1>
<nav class='buttons'><!--
--><ul><!--
--><li data-name='summary'><a href='<%- ctx.formatClientLink('pool', ctx.pool.id) %>'>Summary</a></li><!--

2
client/html/post_readonly_sidebar.tpl
View file

@ -93,7 +93,7 @@
--><% if (ctx.canListPosts) { %><!--
--><a href='<%- ctx.formatClientLink('posts', {query: ctx.escapeColons(tag.names[0])}) %>' class='<%= ctx.makeCssName(tag.category, 'tag') %>'><!--
--><% } %><!--
--><%- ctx.getPrettyTagName(tag.names[0]) %>&#32;<!--
--><%- ctx.getPrettyName(tag.names[0]) %>&#32;<!--
--><% if (ctx.canListPosts) { %><!--
--></a><!--
--><% } %><!--

4
client/html/settings.tpl
View file

@ -66,8 +66,8 @@
<li>
<%= ctx.makeCheckbox({
text: 'Display underscores as spaces in tags',
name: 'tag-underscores-as-spaces',
text: 'Display underscores as spaces',
name: 'underscores-as-spaces',
checked: ctx.browsingSettings.tagUnderscoresAsSpaces,
}) %>
<p class='hint'>Display all underscores as if they were spaces. This is only a visual change, which means that you'll still have to use underscores when searching or editing tags.</p>

2
client/html/tag.tpl
View file

@ -1,5 +1,5 @@
<div class='content-wrapper' id='tag'>
<h1><%- ctx.getPrettyTagName(ctx.tag.names[0]) %></h1>
<h1><%- ctx.getPrettyName(ctx.tag.names[0]) %></h1>
<nav class='buttons'><!--
--><ul><!--
--><li data-name='summary'><a href='<%- ctx.formatClientLink('tag', ctx.tag.names[0]) %>'>Summary</a></li><!--

2
client/js/controls/post_readonly_sidebar_control.js
View file

@ -30,7 +30,7 @@ class PostReadonlySidebarControl extends events.EventTarget {
canViewTags: api.hasPrivilege("tags:view"),
escapeColons: uri.escapeColons,
extractRootDomain: uri.extractRootDomain,
getPrettyTagName: misc.getPrettyTagName,
getPrettyName: misc.getPrettyName,
})
);

4
client/js/util/misc.js
View file

@ -204,7 +204,7 @@ function dataURItoBlob(dataURI) {
return new Blob([data], { type: mimeString });
}
function getPrettyTagName(tag) {
function getPrettyName(tag) {
if (settings.get().tagUnderscoresAsSpaces) {
return tag.replace(/_/g, " ");
}
@ -228,5 +228,5 @@ module.exports = {
decamelize: decamelize,
escapeSearchTerm: escapeSearchTerm,
dataURItoBlob: dataURItoBlob,
getPrettyTagName: getPrettyTagName,
getPrettyName: getPrettyName,
};

4
client/js/util/views.js
View file

@ -210,7 +210,7 @@ function makePostLink(id, includeHash) {
function makeTagLink(name, includeHash, includeCount, tag) {
const category = tag ? tag.category : "unknown";
let text = misc.getPrettyTagName(name);
let text = misc.getPrettyName(name);
if (includeHash === true) {
text = "#" + text;
}
@ -235,7 +235,7 @@ function makeTagLink(name, includeHash, includeCount, tag) {
function makePoolLink(id, includeHash, includeCount, pool, name) {
const category = pool ? pool.category : "unknown";
let text = name ? name : pool.names[0];
let text = misc.getPrettyName(name ? name : pool.names[0]);
if (includeHash === true) {
text = "#" + text;
}

2
client/js/views/pool_view.js
View file

@ -18,7 +18,7 @@ class PoolView extends events.EventTarget {
this._ctx = ctx;
ctx.pool.addEventListener("change", (e) => this._evtChange(e));
ctx.section = ctx.section || "summary";
ctx.getPrettyPoolName = misc.getPrettyPoolName;
ctx.getPrettyName = misc.getPrettyName;
this._hostNode = document.getElementById("content-holder");
this._install();

5
client/js/views/settings_view.js
View file

@ -42,9 +42,8 @@ class SettingsView extends events.EventTarget {
tagSuggestions: this._find("tag-suggestions").checked,
autoplayVideos: this._find("autoplay-videos").checked,
postsPerPage: this._find("posts-per-page").value,
tagUnderscoresAsSpaces: this._find(
"tag-underscores-as-spaces"
).checked,
tagUnderscoresAsSpaces: this._find("underscores-as-spaces")
.checked,
},
})
);

2
client/js/views/tag_view.js
View file

@ -18,7 +18,7 @@ class TagView extends events.EventTarget {
this._ctx = ctx;
ctx.tag.addEventListener("change", (e) => this._evtChange(e));
ctx.section = ctx.section || "summary";
ctx.getPrettyTagName = misc.getPrettyTagName;
ctx.getPrettyName = misc.getPrettyName;
this._hostNode = document.getElementById("content-holder");
this._install();