Skip to content

Commit

Permalink
dist build
Browse files Browse the repository at this point in the history
  • Loading branch information
louisameline committed Jul 18, 2016
1 parent 26eb3f3 commit f7d7fec
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 7 deletions.
17 changes: 15 additions & 2 deletions dist/js/tooltipster.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ var defaults = {
hasTransitions: transitionSupport(),
IE: false,
// don't set manually, it will be updated by a build task after the manifest
semVer: '4.0.6',
semVer: '4.1.0',
window: win
},
core = function() {
Expand Down Expand Up @@ -528,7 +528,20 @@ $.Tooltipster.prototype = {
self.__contentSet(self.__options.content);
}
else {
self.__contentSet(initialTitle);

var selector = self._$origin.attr('data-tooltip-content'),
$el;

if (selector){
$el = $(selector);
}

if ($el && $el[0]) {
self.__contentSet($el.first());
}
else {
self.__contentSet(initialTitle);
}
}

self._$origin
Expand Down
4 changes: 2 additions & 2 deletions dist/js/tooltipster.bundle.min.js

Large diffs are not rendered by default.

17 changes: 15 additions & 2 deletions dist/js/tooltipster.core.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ var defaults = {
hasTransitions: transitionSupport(),
IE: false,
// don't set manually, it will be updated by a build task after the manifest
semVer: '4.0.6',
semVer: '4.1.0',
window: win
},
core = function() {
Expand Down Expand Up @@ -528,7 +528,20 @@ $.Tooltipster.prototype = {
self.__contentSet(self.__options.content);
}
else {
self.__contentSet(initialTitle);

var selector = self._$origin.attr('data-tooltip-content'),
$el;

if (selector){
$el = $(selector);
}

if ($el && $el[0]) {
self.__contentSet($el.first());
}
else {
self.__contentSet(initialTitle);
}
}

self._$origin
Expand Down
Loading

0 comments on commit f7d7fec

Please sign in to comment.