diff --git a/admin/themes/default/js/admin-theme.js b/admin/themes/default/js/admin-theme.js index 04acc90b5..8d2ad1b1f 100644 --- a/admin/themes/default/js/admin-theme.js +++ b/admin/themes/default/js/admin-theme.js @@ -377,7 +377,20 @@ $(document).ready(function() { //bootstrap components init $('.dropdown-toggle').dropdown(); - $('.label-tooltip, .help-tooltip').tooltip(); + $('.label-tooltip, .help-tooltip').not('.debug-mode-tooltip').tooltip(); + + $('.debug-mode-tooltip').each(function () { + var $tooltip = $(this); + + if ($.isFunction($.fn.bootstrapTooltip)) { + if (!$tooltip.data('bs.tooltip')) { + $tooltip.bootstrapTooltip({ + html: true, + placement: 'bottom' + }); + } + } + }); $('#error-modal').modal('show'); //init footer @@ -478,7 +491,9 @@ $(document).ready(function() { $('.no-htl-access-option').on('click', function() { $(this).prop('selected', false); }); + initTooltip(); + }); //end dom ready function initTooltip($target, contentFn, items) { @@ -516,4 +531,4 @@ function initTooltip($target, contentFn, items) { } }); }); -} \ No newline at end of file +} diff --git a/admin/themes/default/js/bootstrap-tooltip-alias.js b/admin/themes/default/js/bootstrap-tooltip-alias.js new file mode 100644 index 000000000..00ef3623c --- /dev/null +++ b/admin/themes/default/js/bootstrap-tooltip-alias.js @@ -0,0 +1,8 @@ +/* Preserve Bootstrap 3's tooltip before jQuery UI overwrites $.fn.tooltip. */ +(function ($) { + 'use strict'; + + if ($ && $.fn && $.isFunction($.fn.tooltip) && $.fn.tooltip.Constructor) { + $.fn.bootstrapTooltip = $.fn.tooltip; + } +}(window.jQuery)); diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl index bb6f6f97f..1316ec153 100644 --- a/admin/themes/default/template/header.tpl +++ b/admin/themes/default/template/header.tpl @@ -301,7 +301,7 @@ {if isset($debug_mode) && $debug_mode == true}