Commit ee506f2a authored by Pat Kira's avatar Pat Kira Committed by Aaron Wells
Browse files

bug 1555407 - Fixed overlapping carousel in collapsible block

behatnotneeded

Change-Id: I105728bdc5ed9c500e86efc99965c3936e543f17
parent e6cf3dce
...@@ -177,7 +177,15 @@ jQuery(function($) { ...@@ -177,7 +177,15 @@ jQuery(function($) {
initThumbnailMasonry(); initThumbnailMasonry();
}); });
$('.modal-docked-right').on('click',function(e) { $(window).on('load', function() {
carouselHeight();
});
$('.block.collapse').on('shown.bs.collapse', function() {
carouselHeight();
});
$('.block.collapse').on('click',function(e) {
var dialog = $('.modal-dialog'), var dialog = $('.modal-dialog'),
dialogParent = $(e.target).closest('.modal-dialog').length; dialogParent = $(e.target).closest('.modal-dialog').length;
...@@ -186,7 +194,6 @@ jQuery(function($) { ...@@ -186,7 +194,6 @@ jQuery(function($) {
} }
}); });
carouselHeight();
affixSize(); affixSize();
siteMessages(); siteMessages();
focusOnOpen(); focusOnOpen();
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{if $title} {if $title}
<h3 class="title panel-heading js-heading"> <h3 class="title panel-heading js-heading">
{if $retractable} {if $retractable}
<a data-toggle="collapse" href="#blockinstance_{$id}_target" aria-expanded="true" aria-controls="blockinstance_{$id}_target" class="outer-link{if $retractedonload} collapsed{/if}"></a> <a data-toggle="collapse" href="#blockinstance_{$id}_target" aria-expanded="{if $retractedonload}false{else}true{/if}" aria-controls="blockinstance_{$id}_target" class="outer-link{if $retractedonload} collapsed{/if}"></a>
{/if} {/if}
{$title} {$title}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment