From 193374690cd7cab27dad6aa39795278a4158bf5e Mon Sep 17 00:00:00 2001 From: Molkobain Date: Wed, 21 Nov 2018 20:51:20 +0100 Subject: [PATCH] Fix compatibility with iTop 2.6 (jQuery 3+) --- README.md | 2 +- ...lass.inc.php => uiextension.class.inc.php} | 20 +++++++++---------- .../module.molkobain-console-tooltips.php | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) rename dist/molkobain-console-tooltips/console/{consoleuiextension.class.inc.php => uiextension.class.inc.php} (90%) diff --git a/README.md b/README.md index 6528c15..4b9a15b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Compatible with iTop 2.3+ ### Installation * Unzip the extension * Copy the ``dist/molkobain-console-tooltip`` folder under ``/extensions`` folder of your iTop -* Run iTop setup & select extension *Console: Tooltips on object's properties* +* Run iTop setup & select extension *Attributes description tooltip* *Your folders should look like this* diff --git a/dist/molkobain-console-tooltips/console/consoleuiextension.class.inc.php b/dist/molkobain-console-tooltips/console/uiextension.class.inc.php similarity index 90% rename from dist/molkobain-console-tooltips/console/consoleuiextension.class.inc.php rename to dist/molkobain-console-tooltips/console/uiextension.class.inc.php index 5181269..2fc84d9 100644 --- a/dist/molkobain-console-tooltips/console/consoleuiextension.class.inc.php +++ b/dist/molkobain-console-tooltips/console/uiextension.class.inc.php @@ -11,18 +11,18 @@ namespace Molkobain\iTop\Console\Tooltips\Extension; -use utils; -use MetaModel; use DBObjectSet; -use WebPage; use iApplicationUIExtension; +use MetaModel; +use utils; +use WebPage; /** - * Class ConsoleUIExtension + * Class UIExtension * * @package Molkobain\iTop\Console\Tooltips\Extension */ -class ConsoleUIExtension implements iApplicationUIExtension +class UIExtension implements iApplicationUIExtension { const DEFAULT_ENABLED = true; const DEFAULT_DECORATION_CLASS = 'mct-decoration-question'; @@ -53,16 +53,16 @@ public function OnDisplayProperties($oObject, WebPage $oPage, $bEditMode = false var oDecorationElem = $('') .addClass('mct-decoration') .addClass('$sDecorationClass'); + + // Attach to label + oDecorationElem.appendTo($(this)); // Create tooltip - oDecorationElem.qtip( { content: $(this).attr('title'), show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'bottomCenter' }, position: { corner: { target: 'topCenter', tooltip: 'bottomCenter' }, adjust: { y: -15}} } ); + var sContent = $('
').text($(this).attr('title')).html(); + oDecorationElem.qtip( { content: sContent, show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'bottomMiddle' }, position: { corner: { target: 'topCenter', tooltip: 'bottomMiddle' }, adjust: { y: -15}} } ); // Remove native title $(this).attr('title', ''); - - - // Attach to label - oDecorationElem.appendTo($(this)); }); EOF ); diff --git a/dist/molkobain-console-tooltips/module.molkobain-console-tooltips.php b/dist/molkobain-console-tooltips/module.molkobain-console-tooltips.php index f3379fe..748d3f3 100644 --- a/dist/molkobain-console-tooltips/module.molkobain-console-tooltips.php +++ b/dist/molkobain-console-tooltips/module.molkobain-console-tooltips.php @@ -22,7 +22,7 @@ 'visible' => true, // Components 'datamodel' => array( - 'console/consoleuiextension.class.inc.php', + 'console/uiextension.class.inc.php', ), 'webservice' => array( //'webservices.itop-portal-base.php',