Skip to content

Commit

Permalink
dist build
Browse files Browse the repository at this point in the history
  • Loading branch information
@louisameline
louisameline committed Apr 27, 2017
1 parent 7bb4d10 commit cf83e12
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 24 deletions.
29 changes: 19 additions & 10 deletions dist/js/tooltipster.bundle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var defaults = {
hasTransitions: transitionSupport(),
IE: false,
// don't set manually, it will be updated by a build task after the manifest
semVer: '4.2.3',
semVer: '4.2.4',
window: win
},
core = function() {
Expand Down Expand Up @@ -1203,6 +1203,8 @@ $.Tooltipster.prototype = {
// take care of it later
if (bodyContains(self._$origin) && bodyContains(self._$tooltip)) {

var geo = null;

// if the scroll happened on the window
if (event.target === env.window.document) {

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

var g = self.__geometry(),
overflows = false;
geo = self.__geometry();

var overflows = false;

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

if (overflowX != 'visible') {

if ( g.origin.windowOffset.left < bcr.left
|| g.origin.windowOffset.right > bcr.right
if ( geo.origin.windowOffset.left < bcr.left
|| geo.origin.windowOffset.right > bcr.right
) {
overflows = true;
return false;
Expand All @@ -1254,8 +1257,8 @@ $.Tooltipster.prototype = {

if (overflowY != 'visible') {

if ( g.origin.windowOffset.top < bcr.top
|| g.origin.windowOffset.bottom > bcr.bottom
if ( geo.origin.windowOffset.top < bcr.top
|| geo.origin.windowOffset.bottom > bcr.bottom
) {
overflows = true;
return false;
Expand All @@ -1274,6 +1277,7 @@ $.Tooltipster.prototype = {
self._$tooltip.css('visibility', 'hidden');
}
else {

self._$tooltip.css('visibility', 'visible');

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

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

self._trigger({
type: 'scroll',
event: event
event: event,
geo: geo
});
}
}
Expand Down Expand Up @@ -2505,6 +2510,10 @@ $.Tooltipster.prototype = {
// force closing
._close(null, null, true);
}
else {
// there might be an open timeout still running
self.__timeoutsClear();
}

// send event
self._trigger('destroy');
Expand Down
4 changes: 2 additions & 2 deletions dist/js/tooltipster.bundle.min.js
View file

Large diffs are not rendered by default.

29 changes: 19 additions & 10 deletions dist/js/tooltipster.main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var defaults = {
hasTransitions: transitionSupport(),
IE: false,
// don't set manually, it will be updated by a build task after the manifest
semVer: '4.2.3',
semVer: '4.2.4',
window: win
},
core = function() {
Expand Down Expand Up @@ -1203,6 +1203,8 @@ $.Tooltipster.prototype = {
// take care of it later
if (bodyContains(self._$origin) && bodyContains(self._$tooltip)) {

var geo = null;

// if the scroll happened on the window
if (event.target === env.window.document) {

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

var g = self.__geometry(),
overflows = false;
geo = self.__geometry();

var overflows = false;

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

if (overflowX != 'visible') {

if ( g.origin.windowOffset.left < bcr.left
|| g.origin.windowOffset.right > bcr.right
if ( geo.origin.windowOffset.left < bcr.left
|| geo.origin.windowOffset.right > bcr.right
) {
overflows = true;
return false;
Expand All @@ -1254,8 +1257,8 @@ $.Tooltipster.prototype = {

if (overflowY != 'visible') {

if ( g.origin.windowOffset.top < bcr.top
|| g.origin.windowOffset.bottom > bcr.bottom
if ( geo.origin.windowOffset.top < bcr.top
|| geo.origin.windowOffset.bottom > bcr.bottom
) {
overflows = true;
return false;
Expand All @@ -1274,6 +1277,7 @@ $.Tooltipster.prototype = {
self._$tooltip.css('visibility', 'hidden');
}
else {

self._$tooltip.css('visibility', 'visible');

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

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

self._trigger({
type: 'scroll',
event: event
event: event,
geo: geo
});
}
}
Expand Down Expand Up @@ -2505,6 +2510,10 @@ $.Tooltipster.prototype = {
// force closing
._close(null, null, true);
}
else {
// there might be an open timeout still running
self.__timeoutsClear();
}

// send event
self._trigger('destroy');
Expand Down
2 changes: 1 addition & 1 deletion dist/js/tooltipster.main.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"version": "4.2.3"
"version": "4.2.4"
}

0 comments on commit cf83e12

Please sign in to comment.