scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: rename escapeColons to escapeTagName and also escape dots

Browse Source
This commit is contained in:
neobooru
2021-04-10 15:10:39 +02:00
parent 545b5828b5
commit 7c37734fec
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/js/controllers/pool_controller.js
View File

@ -52,7 +52,7 @@ class PoolController {
canMerge: api.hasPrivilege("pools:merge"),
canDelete: api.hasPrivilege("pools:delete"),
categories: categories,
escapeColons: uri.escapeColons,
escapeTagName: uri.escapeTagName,
});
this._view.addEventListener("change", (e) =>

2
client/js/controllers/pool_create_controller.js
View File

@ -26,7 +26,7 @@ class PoolCreateController {
this._view = new PoolCreateView({
canCreate: api.hasPrivilege("pools:create"),
categories: categories,
escapeColons: uri.escapeColons,
escapeTagName: uri.escapeTagName,
});
this._view.addEventListener("submit", (e) =>

2
client/js/controllers/tag_controller.js
View File

@ -56,7 +56,7 @@ class TagController {
canMerge: api.hasPrivilege("tags:merge"),
canDelete: api.hasPrivilege("tags:delete"),
categories: categories,
escapeColons: uri.escapeColons,
escapeTagName: uri.escapeTagName,
});
this._view.addEventListener("change", (e) =>

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

@ -28,7 +28,7 @@ class PostReadonlySidebarControl extends events.EventTarget {
canListPosts: api.hasPrivilege("posts:list"),
canEditPosts: api.hasPrivilege("posts:edit"),
canViewTags: api.hasPrivilege("tags:view"),
escapeColons: uri.escapeColons,
escapeTagName: uri.escapeTagName,
extractRootDomain: uri.extractRootDomain,
getPrettyName: misc.getPrettyName,
})

2
client/js/controls/tag_input_control.js
View File

@ -305,7 +305,7 @@ class TagInputControl extends events.EventTarget {
searchLinkNode.setAttribute(
"href",
uri.formatClientLink("posts", {
query: uri.escapeColons(tag.names[0]),
query: uri.escapeTagName(tag.names[0]),
})
);
searchLinkNode.textContent = tag.names[0] + " ";

6
client/js/util/uri.js
View File

@ -85,14 +85,14 @@ function extractRootDomain(url) {
return domain;
}
function escapeColons(text) {
return text.replace(new RegExp(":", "g"), "\\:");
function escapeTagName(text) {
return text.replace(/:/g, "\\:").replace(/\./g, "\\.");
}
module.exports = {
formatClientLink: formatClientLink,
formatApiLink: formatApiLink,
escapeColons: escapeColons,
escapeTagName: escapeTagName,
escapeParam: escapeParam,
unescapeParam: unescapeParam,
extractHostname: extractHostname,