diff --git a/src/_h5ai/public/js/lib/ext/crumb.js b/src/_h5ai/public/js/lib/ext/crumb.js index 47cd1ccd..5e75fafd 100644 --- a/src/_h5ai/public/js/lib/ext/crumb.js +++ b/src/_h5ai/public/js/lib/ext/crumb.js @@ -20,7 +20,8 @@ let $crumbbar; function createHtml(item) { - const $html = jq(crumbTemplate).data('item', item); + const $html = jq(crumbTemplate); + $html[0]._item = item; item.elCrumb = $html[0]; location.setLink($html, item); diff --git a/src/_h5ai/public/js/lib/ext/preview-aud.js b/src/_h5ai/public/js/lib/ext/preview-aud.js index 564cdc51..e4c39f36 100644 --- a/src/_h5ai/public/js/lib/ext/preview-aud.js +++ b/src/_h5ai/public/js/lib/ext/preview-aud.js @@ -85,8 +85,8 @@ function initItem(item) { item.$view.find('a').on('click', ev => { ev.preventDefault(); - const matchedItems = lo.compact(lo.map(jq('#items .item'), matchedItem => { - matchedItem = jq(matchedItem).data('item'); + const matchedItems = lo.compact(lo.map(jq('#items .item'), el => { + const matchedItem = el._item; return lo.includes(settings.types, matchedItem.type) ? matchedItem : null; })); diff --git a/src/_h5ai/public/js/lib/ext/preview-img.js b/src/_h5ai/public/js/lib/ext/preview-img.js index 7cb88599..3e557a81 100644 --- a/src/_h5ai/public/js/lib/ext/preview-img.js +++ b/src/_h5ai/public/js/lib/ext/preview-img.js @@ -116,8 +116,8 @@ function initItem(item) { item.$view.find('a').on('click', ev => { ev.preventDefault(); - const matchedItems = lo.compact(lo.map(jq('#items .item'), matchedItem => { - matchedItem = jq(matchedItem).data('item'); + const matchedItems = lo.compact(lo.map(jq('#items .item'), el => { + const matchedItem = el._item; return lo.includes(settings.types, matchedItem.type) ? matchedItem : null; })); diff --git a/src/_h5ai/public/js/lib/ext/preview-txt.js b/src/_h5ai/public/js/lib/ext/preview-txt.js index 32d588e5..397f0ff0 100644 --- a/src/_h5ai/public/js/lib/ext/preview-txt.js +++ b/src/_h5ai/public/js/lib/ext/preview-txt.js @@ -117,8 +117,8 @@ function initItem(item) { item.$view.find('a').on('click', ev => { ev.preventDefault(); - const matchedItems = lo.compact(lo.map(jq('#items .item'), matchedItem => { - matchedItem = jq(matchedItem).data('item'); + const matchedItems = lo.compact(lo.map(jq('#items .item'), el => { + const matchedItem = el._item; return lo.includes(lo.keys(settings.types), matchedItem.type) ? matchedItem : null; })); diff --git a/src/_h5ai/public/js/lib/ext/preview-vid.js b/src/_h5ai/public/js/lib/ext/preview-vid.js index 3c897e09..bb11243f 100644 --- a/src/_h5ai/public/js/lib/ext/preview-vid.js +++ b/src/_h5ai/public/js/lib/ext/preview-vid.js @@ -85,8 +85,8 @@ function initItem(item) { item.$view.find('a').on('click', ev => { ev.preventDefault(); - const matchedItems = lo.compact(lo.map(jq('#items .item'), matchedItem => { - matchedItem = jq(matchedItem).data('item'); + const matchedItems = lo.compact(lo.map(jq('#items .item'), el => { + const matchedItem = el._item; return lo.includes(settings.types, matchedItem.type) ? matchedItem : null; })); diff --git a/src/_h5ai/public/js/lib/ext/select.js b/src/_h5ai/public/js/lib/ext/select.js index 03e4f5f2..320022fe 100644 --- a/src/_h5ai/public/js/lib/ext/select.js +++ b/src/_h5ai/public/js/lib/ext/select.js @@ -26,9 +26,7 @@ const $selectionRect = jq('
'); function publish() { - const items = lo.map(jq('#items .item.selected'), itemElement => { - return jq(itemElement).data('item'); - }); + const items = lo.map(jq('#items .item.selected'), el => el._item); event.pub('selection', items); } diff --git a/src/_h5ai/public/js/lib/ext/tree.js b/src/_h5ai/public/js/lib/ext/tree.js index 2d36a3de..8682f09b 100644 --- a/src/_h5ai/public/js/lib/ext/tree.js +++ b/src/_h5ai/public/js/lib/ext/tree.js @@ -53,9 +53,8 @@ function update(item) { const $img = $html.find('.icon img'); const $label = $html.find('.label'); - $html - .addClass(item.isFolder() ? 'folder' : 'file') - .data('item', item); + $html.addClass(item.isFolder() ? 'folder' : 'file'); + $html[0]._item = item; location.setLink($a, item); $img.attr('src', resource.icon('folder')); @@ -126,7 +125,7 @@ function createOnIndicatorClick() { return ev => { let $indicator = jq(ev.currentTarget); let $item = $indicator.closest('.item'); - const item = $item.data('item'); + const item = $item[0]._item; let $content = $item.find('> ul.content'); if ($indicator.hasClass('unknown')) { diff --git a/src/_h5ai/public/js/lib/view/view.js b/src/_h5ai/public/js/lib/view/view.js index 2b872998..05f11cae 100644 --- a/src/_h5ai/public/js/lib/view/view.js +++ b/src/_h5ai/public/js/lib/view/view.js @@ -127,9 +127,7 @@ const createHtml = item => { const $date = $html.find('.date'); const $size = $html.find('.size'); - $html - .addClass(item.isFolder() ? 'folder' : 'file') - .data('item', item); + $html.addClass(item.isFolder() ? 'folder' : 'file'); $html[0]._item = item; location.setLink($a, item);