Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
louisameline committed Feb 24, 2014
1 parent b35de6c commit ea690b6
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tooltipster",
"version": "3.0.5",
"version": "3.1.0",
"main": ["js/jquery.tooltipster.min.js", "css/tooltipster.css"],
"dependencies": {
"jquery": ">=1.7"
Expand Down
60 changes: 30 additions & 30 deletions js/jquery.tooltipster.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,36 +214,36 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI

var self = this;

// save the method callback and cancel hide method callbacks
if (callback) self.callbacks.show.push(callback);
self.callbacks.hide = [];

//get rid of any appearance timer
clearTimeout(self.timerShow);
self.timerShow = null;
clearTimeout(self.timerHide);
self.timerHide = null;

// continue only if the tooltip is enabled and has any content
if (self.enabled && self.content !== null) {
// call our constructor custom function before continuing
self.options.functionBefore.call(self.$el, self.$el, function() {

// if we only want one tooltip open at a time, close all auto-closing tooltips currently open and not already disappearing
if (self.options.onlyOne) {
$('.tooltipstered').not(self.$el).each(function(i,el) {

// we have to use the public methods here
var $el = $(el),
s = $el[pluginName]('status'),
ac = $el[pluginName]('option', 'autoClose');

if (s !== 'hidden' && s !== 'disappearing' && ac) {
$el[pluginName]('hide');
}
});
}
// continue only if the tooltip is enabled and has any content
if (self.enabled && self.content !== null) {

// call our constructor custom function before continuing
self.options.functionBefore.call(self.$el, self.$el, function() {
// save the method callback and cancel hide method callbacks
if (callback) self.callbacks.show.push(callback);
self.callbacks.hide = [];

//get rid of any appearance timer
clearTimeout(self.timerShow);
self.timerShow = null;
clearTimeout(self.timerHide);
self.timerHide = null;

// if we only want one tooltip open at a time, close all auto-closing tooltips currently open and not already disappearing
if (self.options.onlyOne) {
$('.tooltipstered').not(self.$el).each(function(i,el) {

// we have to use the public methods here
var $el = $(el),
s = $el[pluginName]('status'),
ac = $el[pluginName]('option', 'autoClose');

if (s !== 'hidden' && s !== 'disappearing' && ac) {
$el[pluginName]('hide');
}
});
}

var finish = function() {
self.status = 'shown';
Expand Down Expand Up @@ -428,8 +428,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
self.hideTooltip();
}, self.options.timer + extraTime);
}
});
}
}
});
},

setCheckInterval: function(){
Expand Down
2 changes: 1 addition & 1 deletion js/jquery.tooltipster.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tooltipster.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"keywords": [
"tooltip"
],
"version": "3.0.5",
"version": "3.1.0",
"author": {
"name": "Caleb Jacob",
"url": "http://calebjacob.com/"
Expand Down

0 comments on commit ea690b6

Please sign in to comment.