From d7d31d00ea3ee337915241d5c047ab320f3d29f5 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 7 Feb 2022 14:11:48 +0100 Subject: [PATCH] Drop expandable.js --- doc/80-Upgrading.md | 2 ++ library/Icinga/Web/JavaScript.php | 1 - public/css/icinga/widgets.less | 45 ----------------------- public/js/icinga/behavior/expandable.js | 47 ------------------------- 4 files changed, 2 insertions(+), 93 deletions(-) delete mode 100644 public/js/icinga/behavior/expandable.js diff --git a/doc/80-Upgrading.md b/doc/80-Upgrading.md index 26b6528d6..85e89f121 100644 --- a/doc/80-Upgrading.md +++ b/doc/80-Upgrading.md @@ -8,6 +8,8 @@ v2.6 to v2.8 requires to follow the instructions for v2.7 too. **Framework changes affecting third-party code** * Asset support for modules (#3961) introduced with v2.8 has now been removed. +* `expandable-toggle`-support has been removed. Use `class="collapsible" data-visible-height=0` + to achieve the same effect. (Available since v2.7.0) ## Upgrading to Icinga Web 2 2.9.1 diff --git a/library/Icinga/Web/JavaScript.php b/library/Icinga/Web/JavaScript.php index cce48d866..7d0eed8ec 100644 --- a/library/Icinga/Web/JavaScript.php +++ b/library/Icinga/Web/JavaScript.php @@ -38,7 +38,6 @@ class JavaScript 'js/icinga/behavior/form.js', 'js/icinga/behavior/actiontable.js', 'js/icinga/behavior/flyover.js', - 'js/icinga/behavior/expandable.js', 'js/icinga/behavior/filtereditor.js', 'js/icinga/behavior/selectable.js', 'js/icinga/behavior/modal.js', diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less index d8788a505..e539a5cb5 100644 --- a/public/css/icinga/widgets.less +++ b/public/css/icinga/widgets.less @@ -654,51 +654,6 @@ ul.tree li a.error:hover { } } -input[type="checkbox"].expandable-toggle { - display: none; - - & + label { - float: right; - margin-right: 1em; - - cursor: pointer; - user-select: none; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - } - - & ~ .expandable-content { - clear: right; // Because the label is floating right - } - - &:checked ~ .expandable-content { - -webkit-transition: opacity 0.2s linear; - -moz-transition: opacity 0.2s linear; - -o-transition: opacity 0.2s linear; - transition: opacity 0.2s linear; - } - - &:not(:checked) ~ .expandable-content { - height: 0; - opacity: 0; - visibility: hidden; - - -webkit-transition: opacity 0.2s linear, visibility 0.2s; - -moz-transition: opacity 0.2s linear, visibility 0.2s; - -o-transition: opacity 0.2s linear, visibility 0.2s; - transition: opacity 0.2s linear, visibility 0.2s; - } - - &:checked ~ label .expandable-expand-label { - display: none; - } - - &:not(:checked) ~ label .expandable-collapse-label { - display: none; - } -} - html.no-js .progress-label { display: none; } diff --git a/public/js/icinga/behavior/expandable.js b/public/js/icinga/behavior/expandable.js deleted file mode 100644 index c7156e96a..000000000 --- a/public/js/icinga/behavior/expandable.js +++ /dev/null @@ -1,47 +0,0 @@ -/* Icinga Web 2 | (c) 2017 Icinga Development Team | GPLv2+ */ - -/** - * Icinga.Behavior.Expandable - * - * Initially collapsed, but expandable content - */ -(function(Icinga, $) { - - 'use strict'; - - var expandedExpandables = {}; - - function Expandable(icinga) { - Icinga.EventListener.call(this, icinga); - - this.on('rendered', this.onRendered, this); - this.on('click', this.onClick, this); - } - - Expandable.prototype = new Icinga.EventListener(); - - Expandable.prototype.onRendered = function(event) { - $(event.target).find('.expandable-toggle').each(function() { - var $this = $(this); - - if (typeof expandedExpandables['#' + $this.attr('id')] !== 'undefined') { - $this.prop('checked', true); - } - }); - }; - - Expandable.prototype.onClick = function(event) { - var $expandableToggle = $(event.target); - - if ($expandableToggle.prop('checked')) { - expandedExpandables['#' + $expandableToggle.attr('id')] = null; - } else { - delete expandedExpandables['#' + $expandableToggle.attr('id')]; - } - }; - - Icinga.Behaviors = Icinga.Behaviors || {}; - - Icinga.Behaviors.Expandable = Expandable; - -}) (Icinga, jQuery);