Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix: style and search
  • Loading branch information
Julien Orain committed Aug 30, 2018
commit 0cbd9a2fce2bf60b936413f926520d84cade50e2
3 changes: 2 additions & 1 deletion src/utils/filter-containers.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ let filterTimeout;

function filterTimeoutCallback() {
let newHistory = encodeURI(document.querySelector('#filter').value);
history.pushState({}, '', '?filter=' + newHistory);
let newHistoryNodes = encodeURI(document.querySelector('#filter-nodes').value);
history.pushState({}, '', '?filter=' + newHistory + '&filterNodes=' + newHistoryNodes);
}

function filterHistory() {
Expand Down
16 changes: 11 additions & 5 deletions src/utils/filter-nodes.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
let filterNodesTimeout;

function filterNodesTimeoutCallback() {
let newHistory = encodeURI(document.querySelector('#filter-nodes').value);
history.pushState({}, '', '?filterNodes=' + newHistory);
let newHistory = encodeURI(document.querySelector('#filter').value);
let newHistoryNodes = encodeURI(document.querySelector('#filter-nodes').value);
history.pushState({}, '', '?filter=' + newHistory + '&filterNodes=' + newHistoryNodes);
}

function filterNodesHistory() {
Expand All @@ -28,15 +29,20 @@ export function filterNodes() {
for (let i = 0; i < nodes.length; i++) {

// Get node title.
let spanText = nodes[i].querySelector('.labelarea').querySelector('span').innerHTML;
let spanText = nodes[i].querySelector('.labelarea').querySelectorAll('span');

// Define hidden by default.
let hide = true;

// Iterate through each word, show if any are found.
for (let j = 0; j < filterNodesValues.length; j++) {
if (spanText.indexOf(filterNodesValues[j]) >= 0) {
hide = false;
for(let k = 0; k < spanText.length; k++) {
if (spanText[k].innerHTML.indexOf(filterNodesValues[j]) >= 0) {
hide = false;
break;
}
}
if(!hide) {
break;
}
}
Expand Down
24 changes: 20 additions & 4 deletions src/vis-physical/styles.less
Original file line number Diff line number Diff line change
Expand Up @@ -230,18 +230,34 @@
100% { opacity: 1; transform: scale(1); max-height: 500px; }
}

#vis-physical .container.hide, #vis-physical .node.hide {
#vis-physical .container.hide{
animation: hide .5s forwards;
}

#vis-physical .container.show, #vis-physical .node.show {
#vis-physical .container.show {
animation: show .5s forwards;
}

#filter-wrapper.hide, #filter-nodes-wrapper.hide {
#filter-wrapper.hide, {
animation: hide .5s forwards;
}

#filter-wrapper.show, #filter-nodes-wrapper.show {
#filter-wrapper.show {
animation: show .5s forwards;
}

#vis-physical .node.hide {
display: none;
}

#vis-physical .node.show {
display: block;
}

#filter-nodes-wrapper.hide {
display: none;
}

#filter-nodes-wrapper.show {
display: block;
}