Skip to content

Commit cf83e12

Browse files
louisamelinelouisameline
committed
dist build
1 parent 7bb4d10 commit cf83e12

File tree

5 files changed

+42
-24
lines changed

5 files changed

+42
-24
lines changed

‎dist/js/tooltipster.bundle.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ var defaults = {
8989
hasTransitions: transitionSupport(),
9090
IE: false,
9191
// don't set manually, it will be updated by a build task after the manifest
92-
semVer: '4.2.3',
92+
semVer: '4.2.4',
9393
window: win
9494
},
9595
core = function() {
@@ -1203,6 +1203,8 @@ $.Tooltipster.prototype = {
12031203
// take care of it later
12041204
if (bodyContains(self._$origin) && bodyContains(self._$tooltip)) {
12051205

1206+
var geo = null;
1207+
12061208
// if the scroll happened on the window
12071209
if (event.target === env.window.document) {
12081210

@@ -1225,8 +1227,9 @@ $.Tooltipster.prototype = {
12251227
// hides its overflow, we'll just hide (not close) the tooltip.
12261228
else {
12271229

1228-
var g = self.__geometry(),
1229-
overflows = false;
1230+
geo = self.__geometry();
1231+
1232+
var overflows = false;
12301233

12311234
// a fixed position origin is not affected by the overflow hiding
12321235
// of a parent
@@ -1244,8 +1247,8 @@ $.Tooltipster.prototype = {
12441247

12451248
if (overflowX != 'visible') {
12461249

1247-
if ( g.origin.windowOffset.left < bcr.left
1248-
|| g.origin.windowOffset.right > bcr.right
1250+
if ( geo.origin.windowOffset.left < bcr.left
1251+
|| geo.origin.windowOffset.right > bcr.right
12491252
) {
12501253
overflows = true;
12511254
return false;
@@ -1254,8 +1257,8 @@ $.Tooltipster.prototype = {
12541257

12551258
if (overflowY != 'visible') {
12561259

1257-
if ( g.origin.windowOffset.top < bcr.top
1258-
|| g.origin.windowOffset.bottom > bcr.bottom
1260+
if ( geo.origin.windowOffset.top < bcr.top
1261+
|| geo.origin.windowOffset.bottom > bcr.bottom
12591262
) {
12601263
overflows = true;
12611264
return false;
@@ -1274,6 +1277,7 @@ $.Tooltipster.prototype = {
12741277
self._$tooltip.css('visibility', 'hidden');
12751278
}
12761279
else {
1280+
12771281
self._$tooltip.css('visibility', 'visible');
12781282

12791283
// reposition
@@ -1287,8 +1291,8 @@ $.Tooltipster.prototype = {
12871291
// only the scroll distance of the scrollable areas are taken into
12881292
// account (the scrolltop value of the main window must be
12891293
// ignored since the tooltip already moves with it)
1290-
var offsetLeft = g.origin.offset.left - self.__Geometry.origin.offset.left,
1291-
offsetTop = g.origin.offset.top - self.__Geometry.origin.offset.top;
1294+
var offsetLeft = geo.origin.offset.left - self.__Geometry.origin.offset.left,
1295+
offsetTop = geo.origin.offset.top - self.__Geometry.origin.offset.top;
12921296

12931297
// add the offset to the position initially computed by the display plugin
12941298
self._$tooltip.css({
@@ -1301,7 +1305,8 @@ $.Tooltipster.prototype = {
13011305

13021306
self._trigger({
13031307
type: 'scroll',
1304-
event: event
1308+
event: event,
1309+
geo: geo
13051310
});
13061311
}
13071312
}
@@ -2505,6 +2510,10 @@ $.Tooltipster.prototype = {
25052510
// force closing
25062511
._close(null, null, true);
25072512
}
2513+
else {
2514+
// there might be an open timeout still running
2515+
self.__timeoutsClear();
2516+
}
25082517

25092518
// send event
25102519
self._trigger('destroy');

‎dist/js/tooltipster.bundle.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/tooltipster.main.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ var defaults = {
8989
hasTransitions: transitionSupport(),
9090
IE: false,
9191
// don't set manually, it will be updated by a build task after the manifest
92-
semVer: '4.2.3',
92+
semVer: '4.2.4',
9393
window: win
9494
},
9595
core = function() {
@@ -1203,6 +1203,8 @@ $.Tooltipster.prototype = {
12031203
// take care of it later
12041204
if (bodyContains(self._$origin) && bodyContains(self._$tooltip)) {
12051205

1206+
var geo = null;
1207+
12061208
// if the scroll happened on the window
12071209
if (event.target === env.window.document) {
12081210

@@ -1225,8 +1227,9 @@ $.Tooltipster.prototype = {
12251227
// hides its overflow, we'll just hide (not close) the tooltip.
12261228
else {
12271229

1228-
var g = self.__geometry(),
1229-
overflows = false;
1230+
geo = self.__geometry();
1231+
1232+
var overflows = false;
12301233

12311234
// a fixed position origin is not affected by the overflow hiding
12321235
// of a parent
@@ -1244,8 +1247,8 @@ $.Tooltipster.prototype = {
12441247

12451248
if (overflowX != 'visible') {
12461249

1247-
if ( g.origin.windowOffset.left < bcr.left
1248-
|| g.origin.windowOffset.right > bcr.right
1250+
if ( geo.origin.windowOffset.left < bcr.left
1251+
|| geo.origin.windowOffset.right > bcr.right
12491252
) {
12501253
overflows = true;
12511254
return false;
@@ -1254,8 +1257,8 @@ $.Tooltipster.prototype = {
12541257

12551258
if (overflowY != 'visible') {
12561259

1257-
if ( g.origin.windowOffset.top < bcr.top
1258-
|| g.origin.windowOffset.bottom > bcr.bottom
1260+
if ( geo.origin.windowOffset.top < bcr.top
1261+
|| geo.origin.windowOffset.bottom > bcr.bottom
12591262
) {
12601263
overflows = true;
12611264
return false;
@@ -1274,6 +1277,7 @@ $.Tooltipster.prototype = {
12741277
self._$tooltip.css('visibility', 'hidden');
12751278
}
12761279
else {
1280+
12771281
self._$tooltip.css('visibility', 'visible');
12781282

12791283
// reposition
@@ -1287,8 +1291,8 @@ $.Tooltipster.prototype = {
12871291
// only the scroll distance of the scrollable areas are taken into
12881292
// account (the scrolltop value of the main window must be
12891293
// ignored since the tooltip already moves with it)
1290-
var offsetLeft = g.origin.offset.left - self.__Geometry.origin.offset.left,
1291-
offsetTop = g.origin.offset.top - self.__Geometry.origin.offset.top;
1294+
var offsetLeft = geo.origin.offset.left - self.__Geometry.origin.offset.left,
1295+
offsetTop = geo.origin.offset.top - self.__Geometry.origin.offset.top;
12921296

12931297
// add the offset to the position initially computed by the display plugin
12941298
self._$tooltip.css({
@@ -1301,7 +1305,8 @@ $.Tooltipster.prototype = {
13011305

13021306
self._trigger({
13031307
type: 'scroll',
1304-
event: event
1308+
event: event,
1309+
geo: geo
13051310
});
13061311
}
13071312
}
@@ -2505,6 +2510,10 @@ $.Tooltipster.prototype = {
25052510
// force closing
25062511
._close(null, null, true);
25072512
}
2513+
else {
2514+
// there might be an open timeout still running
2515+
self.__timeoutsClear();
2516+
}
25082517

25092518
// send event
25102519
self._trigger('destroy');

‎dist/js/tooltipster.main.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@
4444
"scripts": {
4545
"test": "echo \"Error: no test specified\" && exit 1"
4646
},
47-
"version": "4.2.3"
47+
"version": "4.2.4"
4848
}

0 commit comments

Comments
 (0)