diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-06 13:55:23 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-09-06 13:55:23 +0300 |
commit | de82bd8e447ae7b4b7e66f0368f5f43311848186 (patch) | |
tree | 19e49f95e95d12f995176b33a84ff894e6ccfc19 /app/assets/javascripts/breadcrumb.js | |
parent | 68e9372acd2285055df70cdf84665febfb496166 (diff) |
fixed up JS to use a js-* class
fixed up Ruby based on review
Diffstat (limited to 'app/assets/javascripts/breadcrumb.js')
-rw-r--r-- | app/assets/javascripts/breadcrumb.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/breadcrumb.js b/app/assets/javascripts/breadcrumb.js index 7433fcbbad1..10fbcfe96cf 100644 --- a/app/assets/javascripts/breadcrumb.js +++ b/app/assets/javascripts/breadcrumb.js @@ -1,5 +1,7 @@ export const addTooltipToEl = (el) => { - if (el.scrollWidth > el.offsetWidth) { + const textEl = el.querySelector('.js-breadcrumb-item-text'); + + if (textEl && textEl.scrollWidth > textEl.offsetWidth) { el.setAttribute('title', el.textContent); el.setAttribute('data-container', 'body'); el.classList.add('has-tooltip'); @@ -7,10 +9,12 @@ export const addTooltipToEl = (el) => { }; export default () => { - const breadcrumbs = document.querySelector('.breadcrumbs-list'); + const breadcrumbs = document.querySelector('.js-breadcrumbs-list'); if (breadcrumbs) { - const topLevelLinks = breadcrumbs.querySelectorAll('.breadcrumbs-list > li > a'); + const topLevelLinks = [...breadcrumbs.children].filter(el => !el.classList.contains('dropdown')) + .map(el => el.querySelector('a')) + .filter(el => el); const $expander = $('.js-breadcrumbs-collapsed-expander'); topLevelLinks.forEach(el => addTooltipToEl(el)); |