Skip to content
Permalink
Browse files

Fixed #16 where the options passed to the constructor were not being …

…applied anymore, since the previous commit; thanks Gianluca Finocchiaro!
  • Loading branch information...
stefangabos committed Oct 12, 2018
1 parent c30d8f8 commit 95d926c9e3c18e264ad0c6e35ccc5d95228c5768
Showing with 5 additions and 5 deletions.
  1. +1 −1 dist/zebra_tooltips.min.js
  2. +2 −2 dist/zebra_tooltips.src.js
  3. +2 −2 src/zebra_tooltips.src.js

Some generated files are not rendered by default. Learn more.

@@ -21,7 +21,7 @@
* Read more {@link https://github.com/stefangabos/Zebra_Tooltips/ here}
*
* @author Stefan Gabos <contact@stefangabos.ro>
* @version 2.1.0 (last revision: August 28, 2018)
* @version 2.1.0 (last revision: October 12, 2018)
* @copyright (c) 2012 - 2018 Stefan Gabos
* @license http://www.gnu.org/licenses/lgpl-3.0.txt GNU LESSER GENERAL PUBLIC LICENSE
* @package Zebra_Tooltips
@@ -200,7 +200,7 @@

// the current tooltip's settings are the default ones merged with the ones set when initializing
// the plugin and merged with any data attributes set for the parent element
tooltip_settings = $.extend(defaults, plugin.settings, tooltip_settings);
tooltip_settings = $.extend(defaults, plugin.settings, options, tooltip_settings);

// if the element's title attribute is set, that has the highest priority for content
if (title) tooltip_settings.content = $element.attr('title');
@@ -21,7 +21,7 @@
* Read more {@link https://github.com/stefangabos/Zebra_Tooltips/ here}
*
* @author Stefan Gabos <contact@stefangabos.ro>
* @version 2.1.0 (last revision: August 28, 2018)
* @version 2.1.0 (last revision: October 12, 2018)
* @copyright (c) 2012 - 2018 Stefan Gabos
* @license http://www.gnu.org/licenses/lgpl-3.0.txt GNU LESSER GENERAL PUBLIC LICENSE
* @package Zebra_Tooltips
@@ -200,7 +200,7 @@

// the current tooltip's settings are the default ones merged with the ones set when initializing
// the plugin and merged with any data attributes set for the parent element
tooltip_settings = $.extend(defaults, plugin.settings, tooltip_settings);
tooltip_settings = $.extend(defaults, plugin.settings, options, tooltip_settings);

// if the element's title attribute is set, that has the highest priority for content
if (title) tooltip_settings.content = $element.attr('title');

0 comments on commit 95d926c

Please sign in to comment.
You can’t perform that action at this time.