Accords-Library-Archive
/
gallery.accords-library.com
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

client/tags: fix tagging with aliases 

Fixes #93
This commit is contained in:
rr- 2016-09-18 10:48:22 +02:00
parent 600db78a45
commit 119c2449cd
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,6 +135,8 @@ class TagInputControl extends events.EventTarget {
} }
isTaggedWith(tagName) { isTaggedWith(tagName) {
let actualTag = null;
[tagName, actualTag] = this._transformTagName(tagName);
return this.tags return this.tags
.map(t => t.toLowerCase()) .map(t => t.toLowerCase())
.includes(tagName.toLowerCase()); .includes(tagName.toLowerCase());
@ -153,6 +155,8 @@ class TagInputControl extends events.EventTarget {
return; return;
} }
let actualTag = null;
[tagName, actualTag] = this._transformTagName(tagName);
if (!this.isTaggedWith(tagName)) { if (!this.isTaggedWith(tagName)) {
this.tags.push(tagName); this.tags.push(tagName);
} }
@ -177,6 +181,8 @@ class TagInputControl extends events.EventTarget {
if (!tagName) { if (!tagName) {
return; return;
} }
let actualTag = null;
[tagName, actualTag] = this._transformTagName(tagName);
if (!this.isTaggedWith(tagName)) { if (!this.isTaggedWith(tagName)) {
return; return;
} }
@ -270,7 +276,17 @@ class TagInputControl extends events.EventTarget {
} }
} }
_transformTagName(tagName) {
const actualTag = tags.getTagByName(tagName);
if (actualTag) {
tagName = actualTag.names[0];
}
return [tagName, actualTag];
}
_getListItemNodeFromTagName(tagName) { _getListItemNodeFromTagName(tagName) {
let actualTag = null;
[tagName, actualTag] = this._transformTagName(tagName);
for (let listItemNode of this._tagListNode.querySelectorAll('li')) { for (let listItemNode of this._tagListNode.querySelectorAll('li')) {
if (listItemNode.getAttribute('data-tag').toLowerCase() === if (listItemNode.getAttribute('data-tag').toLowerCase() ===
tagName.toLowerCase()) { tagName.toLowerCase()) {
@ -281,13 +297,11 @@ class TagInputControl extends events.EventTarget {
} }
_createListItemNode(tagName) { _createListItemNode(tagName) {
const actualTag = tags.getTagByName(tagName); let actualTag = null;
[tagName, actualTag] = this._transformTagName(tagName);
const className = actualTag ? const className = actualTag ?
misc.makeCssName(actualTag.category, 'tag') : misc.makeCssName(actualTag.category, 'tag') :
null; null;
if (actualTag) {
tagName = actualTag.names[0];
}
const tagLinkNode = document.createElement('a'); const tagLinkNode = document.createElement('a');
if (className) { if (className) {