mirror of
https://github.com/e107inc/e107.git
synced 2025-07-29 02:40:25 +02:00
Avoid a conflict when using a data-label within a carousel.
This commit is contained in:
@@ -128,7 +128,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
|
|||||||
placement: placement,
|
placement: placement,
|
||||||
container: 'body',
|
container: 'body',
|
||||||
delay: {
|
delay: {
|
||||||
show: 300,
|
show: 200,
|
||||||
hide: 600
|
hide: 600
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -858,7 +858,7 @@ $(document).ready(function()
|
|||||||
|
|
||||||
$('body').on('slid.bs.carousel', '.carousel', function(){
|
$('body').on('slid.bs.carousel', '.carousel', function(){
|
||||||
|
|
||||||
var label = $(this).find('.active').attr('data-label');
|
var label = $(this).find('.carousel-item.active').attr('data-label');
|
||||||
var id = $(this).attr('id') + '-index'; // admin-ui-carousel-index etc.
|
var id = $(this).attr('id') + '-index'; // admin-ui-carousel-index etc.
|
||||||
|
|
||||||
if(label !== undefined)
|
if(label !== undefined)
|
||||||
|
Reference in New Issue
Block a user