hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-1113 - fix tooltip positionning for records previews

Browse Source
This commit is contained in:
Florian BLOUET
2016-05-19 18:29:20 +02:00
parent edaf603552
commit 5be77091cf
1 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/www/common/js/jquery.tooltip.js
View File

@@ -197,8 +197,9 @@
event.cancelBubble = true; event.cancelBubble = true;
if ($.tooltip.blocked || this == $.tooltip.current || (!this.tooltipText && !this.tooltipSrc && !settings(this).bodyHandler)) if ($.tooltip.blocked || this == $.tooltip.current || (!this.tooltipText && !this.tooltipSrc && !settings(this).bodyHandler)) {
return; return;
}
// save current // save current
$.tooltip.current = this; $.tooltip.current = this;
@@ -239,7 +240,7 @@
helper.body.show(); helper.body.show();
var $this = $.tooltip.current; var $this = $.tooltip.current;
var tooltipSettings = settings($this) ? settings($this) : {}; var tooltipSettings = settings($this) ? settings($this) : {};
var fixedPosition = tooltipSettings.fixable ? tooltipSettings.fixable : false; var fixedPosition = $.tooltip.blocked;
// fix PNG background for IE // fix PNG background for IE
if (tooltipSettings.fixPNG) if (tooltipSettings.fixPNG)
helper.parent.fixPNG(); helper.parent.fixPNG();
@@ -365,7 +366,6 @@
// since event target can have different positionning, try to get common closest parent: // since event target can have different positionning, try to get common closest parent:
var $eventTarget = $origEventTarget.closest('.diapo'); var $eventTarget = $origEventTarget.closest('.diapo');
if ($eventTarget.length > 0) { if ($eventTarget.length > 0) {
// tooltip from records answer // tooltip from records answer
recordWidthOffset = 148; // remove size recordWidthOffset = 148; // remove size
@@ -499,7 +499,6 @@
} }
} }
var resizeProperties = { var resizeProperties = {
left: left, left: left,
top: top top: top
@@ -575,6 +574,7 @@
showOverlay('_tooltip', 'body', unfix_tooltip, settings(this).fixableIndex); showOverlay('_tooltip', 'body', unfix_tooltip, settings(this).fixableIndex);
$('#tooltip .tooltip_closer').show().bind('click', unfix_tooltip); $('#tooltip .tooltip_closer').show().bind('click', unfix_tooltip);
$.tooltip.blocked = true; $.tooltip.blocked = true;
positioning.apply(this, arguments);
} }
function visible() { function visible() {
@@ -613,7 +613,6 @@
// remove position helper classes // remove position helper classes
helper.parent.removeClass("viewport-right").removeClass("viewport-bottom"); helper.parent.removeClass("viewport-right").removeClass("viewport-bottom");
if (!settings($.tooltip.current).outside) { if (!settings($.tooltip.current).outside) {
var left = helper.parent[0].offsetLeft; var left = helper.parent[0].offsetLeft;
var top = helper.parent[0].offsetTop; var top = helper.parent[0].offsetTop;