diff --git a/admin/themes/default/js/admin-theme.js b/admin/themes/default/js/admin-theme.js index 8d2ad1b1f..5d49e1189 100644 --- a/admin/themes/default/js/admin-theme.js +++ b/admin/themes/default/js/admin-theme.js @@ -377,20 +377,7 @@ $(document).ready(function() { //bootstrap components init $('.dropdown-toggle').dropdown(); - $('.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' - }); - } - } - }); + $('.label-tooltip, .help-tooltip').tooltip(); $('#error-modal').modal('show'); //init footer @@ -492,12 +479,12 @@ $(document).ready(function() { $(this).prop('selected', false); }); - initTooltip(); + initUITooltip(); }); //end dom ready -function initTooltip($target, contentFn, items) { - var $elements = $target || $('.tooltip-trigger'); +function initUITooltip($target, contentFn, items) { + var $elements = $target || $('.ui-tooltip-trigger'); if (!$elements.length) { return; } @@ -506,11 +493,11 @@ function initTooltip($target, contentFn, items) { if (!contentFn && $this.data('ui-tooltip')) { return; } - $this.tooltip({ + $this.uiTooltip({ content: contentFn || $this.next('.tooltip-content').html(), items: items || 'span', trigger: 'hover', - tooltipClass: 'tooltip-popup', + tooltipClass: 'ui-tooltip-popup', open: function (event, ui) { if (event.buttons == 1 || event.buttons == 3) { ui.tooltip.remove(); diff --git a/admin/themes/default/js/bootstrap-tooltip-alias.js b/admin/themes/default/js/bootstrap-tooltip-alias.js deleted file mode 100644 index 00ef3623c..000000000 --- a/admin/themes/default/js/bootstrap-tooltip-alias.js +++ /dev/null @@ -1,8 +0,0 @@ -/* 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/sass/partials/_tooltip.sass b/admin/themes/default/sass/partials/_tooltip.sass index d1f445386..f8a134ce7 100644 --- a/admin/themes/default/sass/partials/_tooltip.sass +++ b/admin/themes/default/sass/partials/_tooltip.sass @@ -30,14 +30,14 @@ box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.15) width: auto -.tooltip-trigger +.ui-tooltip-trigger cursor: pointer display: inline-block vertical-align: middle -.ui-tooltip.tooltip-popup +.ui-tooltip.ui-tooltip-popup ul margin: 0 padding: 0 0 0 16px @@ -45,7 +45,7 @@ li padding: 2px 0 -.tooltip-popup-row +.ui-tooltip-popup-row display: flex justify-content: space-between align-items: center diff --git a/admin/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl b/admin/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl index 469679641..ee6eb17b1 100644 --- a/admin/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl +++ b/admin/themes/default/template/controllers/cart_rules/helpers/list/_hotel_names_tooltip.tpl @@ -33,7 +33,7 @@ {/capture} - {capture name='hotel_names_tooltip_title'}+{$hotel_names_remaining|@count}{/capture} + {capture name='hotel_names_tooltip_title'}+{$hotel_names_remaining|@count}{/capture} {include file='helpers/tooltip.tpl' tooltip_content=$smarty.capture.hotel_names_tooltip tooltip_title=$smarty.capture.hotel_names_tooltip_title} {/if} {else} diff --git a/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl b/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl index 6d3920f82..18a184813 100644 --- a/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl +++ b/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl @@ -69,21 +69,21 @@ {displayPrice price=($product.total_price_tax_incl - $product.total_price_tax_excl) currency=$currency->id} {if isset($use_tourism_tax) && $use_tourism_tax && isset($product.tourism_tax_status)} - -   - -