Skip to content

Accessibilty fix and parent names #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikaelgu80 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Accessibilty fix and parent names #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58db912
Accessibility fix
mikaelgu80 Jun 9, 2023
4b0d6eb
Hierarchical names
mikaelgu80 Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions comboTreePlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
collapse: false,
selectableLastNode: false,
withSelectAll: false,
isolatedSelectable: false
isolatedSelectable: false,
includeParentNames: false
};

// LIFE CYCLE
Expand Down Expand Up @@ -148,7 +149,7 @@
itemHtml += '<span class="comboTreeParentPlus">' + (this.options.collapse || collapse ? '<span class="mdi mdi-chevron-right-circle-outline"></span>' : '<span class="mdi mdi-chevron-down-circle-outline"></span>') + '</span>'; // itemHtml += '<span class="comboTreeParentPlus">' + (this.options.collapse ? '+' : '&minus;') + '</span>';

if (this.options.isMultiple)
itemHtml += '<span data-id="' + sourceItem.id + '" data-selectable="' + isSelectable + '" class="comboTreeItemTitle ' + selectableClass + '">' + (!selectableLastNode && isSelectable ? '<input type="checkbox" />' : '') + sourceItem.title + '</span>';
itemHtml += '<span data-id="' + sourceItem.id + '" data-selectable="' + isSelectable + '" class="comboTreeItemTitle ' + selectableClass + '">' + (!selectableLastNode && isSelectable ? '<input name="' + sourceItem.title + '" type="checkbox" />' : '') + sourceItem.title + '</span>';
else
itemHtml += '<span data-id="' + sourceItem.id + '" data-selectable="' + isSelectable + '" class="comboTreeItemTitle ' + selectableClass + '">' + sourceItem.title + '</span>';

Expand Down Expand Up @@ -352,7 +353,8 @@
if ($(ctItem).data("selectable") == true) {
this._selectedItem = {
id: $(ctItem).attr("data-id"),
title: $(ctItem).text()
title: $(ctItem).text(),
parents: $(ctItem).parents('li.ComboTreeItemParent').children("span.comboTreeItemTitle").map(function() {return $(this).text();}).get().reverse().join(' - ')
};

let check = this.isItemInArray(this._selectedItem, this.options.source);
Expand Down Expand Up @@ -563,9 +565,12 @@
ComboTree.prototype.getSelectedNames = function () {
if (this.options.isMultiple && this._selectedItems.length>0){
var tmpArr = [];
for (i=0; i<this._selectedItems.length; i++)
tmpArr.push(this._selectedItems[i].title);

for (i = 0; i < this._selectedItems.length; i++)
if (this.options.includeParentNames) {
tmpArr.push(this._selectedItems[i].parents + '; ' + this._selectedItems[i].title);
} else {
tmpArr.push(this._selectedItems[i].title);
}
return tmpArr;
}
else if (!this.options.isMultiple && this._selectedItem.hasOwnProperty('id')){
Expand Down