diff --git a/src/_h5ai/public/js/lib/core/resource.js b/src/_h5ai/public/js/lib/core/resource.js index 92053bdf..b7723628 100644 --- a/src/_h5ai/public/js/lib/core/resource.js +++ b/src/_h5ai/public/js/lib/core/resource.js @@ -18,11 +18,11 @@ modulejs.define('core/resource', ['_', 'config', 'core/settings'], function (_, return themesHref + href; } - if (_.indexOf(defaultIcons, id) >= 0) { + if (_.includes(defaultIcons, id)) { return defaultThemeHref + id + '.svg'; } - if (_.indexOf(defaultIcons, baseId) >= 0) { + if (_.includes(defaultIcons, baseId)) { return defaultThemeHref + baseId + '.svg'; } diff --git a/src/_h5ai/public/js/lib/ext/preview-aud.js b/src/_h5ai/public/js/lib/ext/preview-aud.js index eb489fee..06fee609 100644 --- a/src/_h5ai/public/js/lib/ext/preview-aud.js +++ b/src/_h5ai/public/js/lib/ext/preview-aud.js @@ -78,13 +78,13 @@ modulejs.define('ext/preview-audio', ['_', '$', 'core/event', 'core/format', 'co } function initItem(item) { - if (item.$view && _.indexOf(settings.types, item.type) >= 0) { + if (item.$view && _.includes(settings.types, item.type)) { item.$view.find('a').on('click', function (ev) { ev.preventDefault(); var matchedItems = _.compact(_.map($('#items .item'), function (matchedItem) { matchedItem = $(matchedItem).data('item'); - return _.indexOf(settings.types, matchedItem.type) >= 0 ? matchedItem : null; + return _.includes(settings.types, matchedItem.type) ? matchedItem : null; })); onEnter(matchedItems, _.indexOf(matchedItems, item)); diff --git a/src/_h5ai/public/js/lib/ext/preview-img.js b/src/_h5ai/public/js/lib/ext/preview-img.js index 35b052ba..b16ce5f8 100644 --- a/src/_h5ai/public/js/lib/ext/preview-img.js +++ b/src/_h5ai/public/js/lib/ext/preview-img.js @@ -107,13 +107,13 @@ modulejs.define('ext/preview-img', ['_', '$', 'core/event', 'core/server', 'core } function initItem(item) { - if (item.$view && _.indexOf(settings.types, item.type) >= 0) { + if (item.$view && _.includes(settings.types, item.type)) { item.$view.find('a').on('click', function (ev) { ev.preventDefault(); var matchedItems = _.compact(_.map($('#items .item'), function (matchedItem) { matchedItem = $(matchedItem).data('item'); - return _.indexOf(settings.types, matchedItem.type) >= 0 ? matchedItem : null; + return _.includes(settings.types, matchedItem.type) ? matchedItem : null; })); onEnter(matchedItems, _.indexOf(matchedItems, item)); diff --git a/src/_h5ai/public/js/lib/ext/preview-txt.js b/src/_h5ai/public/js/lib/ext/preview-txt.js index 1351024d..96dd0776 100644 --- a/src/_h5ai/public/js/lib/ext/preview-txt.js +++ b/src/_h5ai/public/js/lib/ext/preview-txt.js @@ -106,13 +106,13 @@ modulejs.define('ext/preview-txt', ['_', '$', 'marked', 'prism', 'core/event', ' } function initItem(item) { - if (item.$view && _.indexOf(_.keys(settings.types), item.type) >= 0) { + if (item.$view && _.includes(_.keys(settings.types), item.type)) { item.$view.find('a').on('click', function (ev) { ev.preventDefault(); var matchedItems = _.compact(_.map($('#items .item'), function (matchedItem) { matchedItem = $(matchedItem).data('item'); - return _.indexOf(_.keys(settings.types), matchedItem.type) >= 0 ? matchedItem : null; + return _.includes(_.keys(settings.types), matchedItem.type) ? matchedItem : null; })); onEnter(matchedItems, _.indexOf(matchedItems, item)); diff --git a/src/_h5ai/public/js/lib/ext/preview-vid.js b/src/_h5ai/public/js/lib/ext/preview-vid.js index 50a57b44..5b8465a1 100644 --- a/src/_h5ai/public/js/lib/ext/preview-vid.js +++ b/src/_h5ai/public/js/lib/ext/preview-vid.js @@ -79,13 +79,13 @@ modulejs.define('ext/preview-vid', ['_', '$', 'core/event', 'core/settings', 'ex } function initItem(item) { - if (item.$view && _.indexOf(settings.types, item.type) >= 0) { + if (item.$view && _.includes(settings.types, item.type)) { item.$view.find('a').on('click', function (ev) { ev.preventDefault(); var matchedItems = _.compact(_.map($('#items .item'), function (matchedItem) { matchedItem = $(matchedItem).data('item'); - return _.indexOf(settings.types, matchedItem.type) >= 0 ? matchedItem : null; + return _.includes(settings.types, matchedItem.type) ? matchedItem : null; })); onEnter(matchedItems, _.indexOf(matchedItems, item));