Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(accordion): callbacks for closing exclusive accordions #2879

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

fix(accordion): callbacks for closing exclusive accordions #2879

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9363506
fix(accordion): callbacks for closing exclusive accordions
lubber-de Aug 19, 2023
e917cec
fix(accordion): linting fixes
lubber-de Aug 19, 2023
89ea2ae
Merge branch 'develop' into accordionExclusiveCloseCallbacks
lubber-de Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 64 additions & 88 deletions src/definitions/modules/accordion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,14 @@

return;
}
if (settings.onOpening.call($activeContent) === false
|| settings.onChanging.call($activeContent) === false
) {
module.debug('Opening or Changing Callback returned false cancelling open', $activeTitle);

return;
}
module.debug('Opening accordion content', $activeTitle);
settings.onOpening.call($activeContent);
settings.onChanging.call($activeContent);
if (settings.exclusive) {
module.closeOthers.call($activeTitle);
}
Expand Down Expand Up @@ -202,7 +207,7 @@
}
$activeContent
.slideDown(settings.duration, settings.easing, function () {
$activeContent
$(this)
.removeClass(className.animating)
.addClass(className.active)
;
Expand All @@ -227,52 +232,61 @@
isClosing = isActive && isAnimating
;
if ((isActive || isOpening) && !isClosing) {
if (settings.onClosing.call($activeContent) === false
|| settings.onChanging.call($activeContent) === false
) {
module.debug('Closing or Changing Callback returned false cancelling close', $activeTitle);

return;
}
module.debug('Closing accordion content', $activeContent);
settings.onClosing.call($activeContent);
settings.onChanging.call($activeContent);
$activeTitle
.removeClass(className.active)
;
$activeContent
.stop(true, true)
.addClass(className.animating)
;
if (settings.animateChildren) {
if ($.fn.transition !== undefined) {
$activeContent
.children()
.transition({
animation: 'fade out',
queue: false,
useFailSafe: true,
debug: settings.debug,
verbose: settings.verbose,
silent: settings.silent,
duration: settings.duration,
skipInlineHidden: true,
})
;
} else {
$activeContent
.children()
.stop(true, true)
.animate({
opacity: 0,
}, settings.duration, module.resetOpacity);
}
module.forceClose($activeTitle, $activeContent);
}
},

forceClose: function ($activeTitle, $activeContent) {
$activeTitle
.removeClass(className.active)
;
$activeContent
.stop(true, true)
.addClass(className.animating)
;
if (settings.animateChildren) {
if ($.fn.transition !== undefined) {
$activeContent
.children()
.transition({
animation: 'fade out',
queue: false,
useFailSafe: true,
debug: settings.debug,
verbose: settings.verbose,
silent: settings.silent,
duration: settings.duration,
skipInlineHidden: true,
})
;
} else {
$activeContent
.children()
.stop(true, true)
.animate({
opacity: 0,
}, settings.duration, module.resetOpacity);
}
$activeContent
.slideUp(settings.duration, settings.easing, function () {
$activeContent
.removeClass(className.animating)
.removeClass(className.active)
;
module.reset.display.call(this);
settings.onClose.call(this);
settings.onChange.call(this);
})
;
}
$activeContent
.slideUp(settings.duration, settings.easing, function () {
$(this)
.removeClass(className.animating)
.removeClass(className.active)
;
module.reset.display.call(this);
settings.onClose.call(this);
settings.onChange.call(this);
})
;
},

closeOthers: function (index) {
Expand All @@ -288,53 +302,15 @@
$nestedTitles,
$openContents
;
if (settings.closeNested) {
$openTitles = $activeAccordion.find(activeSelector).not($parentTitles);
$openContents = $openTitles.next($content);
} else {
$openTitles = $activeAccordion.find(activeSelector).not($parentTitles);
$openTitles = $activeAccordion.find(activeSelector).not($parentTitles);
if (!settings.closeNested) {
$nestedTitles = $activeAccordion.find(activeContent).find(activeSelector).not($parentTitles);
$openTitles = $openTitles.not($nestedTitles);
$openContents = $openTitles.next($content);
}
$openContents = $openTitles.next($content);
if ($openTitles.length > 0) {
module.debug('Exclusive enabled, closing other content', $openTitles);
$openTitles
.removeClass(className.active)
;
$openContents
.removeClass(className.animating)
.stop(true, true)
;
if (settings.animateChildren) {
if ($.fn.transition !== undefined) {
$openContents
.children()
.transition({
animation: 'fade out',
useFailSafe: true,
debug: settings.debug,
verbose: settings.verbose,
silent: settings.silent,
duration: settings.duration,
skipInlineHidden: true,
})
;
} else {
$openContents
.children()
.stop(true, true)
.animate({
opacity: 0,
}, settings.duration, module.resetOpacity);
}
}
$openContents
.slideUp(settings.duration, settings.easing, function () {
$(this).removeClass(className.active);
module.reset.display.call(this);
})
;
module.forceClose($openTitles, $openContents);
}
},

Expand Down