voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't use last-of-type to select tag object.

Browse source 
It turns out that last-of-type only considers a single tag type,
it doesn't select last element of class if it has a different tag
than the other classed elements.
This commit is contained in:
voussoir 2020-09-14 17:19:00 -07:00
parent a32caafb8b
commit 5501f7279b
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frontends/etiquette_flask/templates/tags.html
View file

@ -268,6 +268,12 @@ var add_tag_button = document.getElementById('add_tag_button');
var message_area = document.getElementById('message_area'); var message_area = document.getElementById('message_area');
common.bind_box_to_button(add_tag_textbox, add_tag_button, false); common.bind_box_to_button(add_tag_textbox, add_tag_button, false);
function tag_object_from_li(li)
{
const tag_objects = li.getElementsByClassName("tag_object");
return tag_objects[tag_objects.length - 1];
}
function easybake_form() function easybake_form()
{ {
let easybake_string = add_tag_textbox.value; let easybake_string = add_tag_textbox.value;
@ -284,7 +290,7 @@ function delete_specific_tag_form(event)
{ {
const delete_button = event.target; const delete_button = event.target;
const hierarchy_self = delete_button.closest("#hierarchy_self"); const hierarchy_self = delete_button.closest("#hierarchy_self");
const tag_object = hierarchy_self.querySelector(".tag_object:last-of-type"); const tag_object = tag_object_from_li(hierarchy_self);
const tag_name = tag_object.innerText; const tag_name = tag_object.innerText;
return api.tags.delete(tag_name, api.tags.callback_go_to_tags); return api.tags.delete(tag_name, api.tags.callback_go_to_tags);
} }
@ -293,7 +299,7 @@ function delete_tag_form(event)
{ {
const delete_button = event.target; const delete_button = event.target;
const li = delete_button.closest("li"); const li = delete_button.closest("li");
const tag_object = li.querySelector(".tag_object:last-of-type"); const tag_object = tag_object_from_li(li);
const tag_name = tag_object.innerText.split(".").pop(); const tag_name = tag_object.innerText.split(".").pop();
return api.tags.delete(tag_name, tag_action_callback); return api.tags.delete(tag_name, tag_action_callback);
} }
@ -302,18 +308,20 @@ function remove_child_form(event)
{ {
const delete_button = event.target; const delete_button = event.target;
const li = delete_button.closest("li"); const li = delete_button.closest("li");
const tag_object = li.querySelector(".tag_object:last-of-type"); const tag_object = tag_object_from_li(li);
const parts = tag_object.innerText.split("."); const parts = tag_object.innerText.split(".");
const tag_name = parts.pop(); const tag_name = parts.pop();
const parent_name = parts.pop(); const parent_name = parts.pop();
return api.tags.remove_child(parent_name, tag_name, tag_action_callback) return api.tags.remove_child(parent_name, tag_name, tag_action_callback);
}
} }
function remove_synonym_form(event) function remove_synonym_form(event)
{ {
const delete_button = event.target; const delete_button = event.target;
const li = delete_button.closest("li"); const li = delete_button.closest("li");
const tag_object = li.querySelector(".tag_object:last-of-type"); const tag_object = tag_object_from_li(li);
const parts = tag_object.innerText.split(".").pop().split("+"); const parts = tag_object.innerText.split(".").pop().split("+");
const synonym = parts.pop(); const synonym = parts.pop();
const tag_name = parts.pop(); const tag_name = parts.pop();