From a4d2397dd1c068a6aa0b0e65cf74233e98c274c3 Mon Sep 17 00:00:00 2001 From: Sukhwinder Dhillon Date: Mon, 23 May 2022 10:26:45 +0200 Subject: [PATCH] Revert "js: Avoid usage of `.matches()` as it isn't available with IE11" This reverts commit cc0c6fc71b06c6883b8af2ae11b40f6b995569d1. --- public/js/icinga/behavior/collapsible.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/js/icinga/behavior/collapsible.js b/public/js/icinga/behavior/collapsible.js index 498325fb2..6e4b4a371 100644 --- a/public/js/icinga/behavior/collapsible.js +++ b/public/js/icinga/behavior/collapsible.js @@ -67,7 +67,7 @@ var toCollapse = []; $.each(document.querySelectorAll('.collapsible'), function (_, collapsible) { - if ($(collapsible).is('.can-collapse')) { + if (collapsible.matches('.can-collapse')) { if (! _this.canCollapse(collapsible)) { var toggleSelector = collapsible.dataset.toggleElement; if (! toggleSelector) { @@ -98,7 +98,7 @@ Collapsible.prototype.onExpand = function(collapsiblePath) { var collapsible = $(collapsiblePath)[0]; - if (collapsible && $(collapsible).is('.can-collapse')) { + if (collapsible && collapsible.matches('.can-collapse')) { this.expand(collapsible); } }; @@ -134,7 +134,7 @@ _this.icinga.logger.error( '[Collapsible] Collapsible control has no associated .collapsible: ', $target[0]); } else if (typeof collapsible.dataset.noPersistence !== 'undefined') { - if ($(collapsible).is('.collapsed')) { + if (collapsible.matches('.collapsed')) { _this.expand(collapsible); } else { _this.collapse(collapsible, _this.calculateCollapsedHeight(collapsible)); @@ -200,9 +200,9 @@ return ''; } - if (collapsible.tagName === 'TABLE') { + if (collapsible.matches('table')) { return '> tbody > tr'; - } else if (collapsible.tagName === 'UL' || collapsible.tagName === 'OL') { + } else if (collapsible.matches('ul, ol')) { return '> li:not(.collapsible-control)'; }