Commit 5ab72f76 authored by fat's avatar fat
Browse files

fix tooltip defaults

parent e74110bf
7 merge requests!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!8157Close Me: Docs "Customize and Download" button fix,!7964commit fixes #7792,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1,!8245Interactive color picker - Closed: request against wrong branch
Showing with 4 additions and 4 deletions
+4 -4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="/assets/js/jquery.js"></script> <script src="/assets/js/jquery.js"></script>
<script src="/assets/js/bootstrap.min.js"></script> <script src="/assets/js/bootstrap.js"></script>
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="/assets/js/holder/holder.js"></script> <script src="/assets/js/holder/holder.js"></script>
......
...@@ -1083,7 +1083,7 @@ ...@@ -1083,7 +1083,7 @@
} }
Tooltip.prototype.enter = function (e) { Tooltip.prototype.enter = function (e) {
var defaults = $.fn[this.type].defaults var defaults = this.getDefaults()
var options = {} var options = {}
this._options && $.each(this._options, function (key, value) { this._options && $.each(this._options, function (key, value) {
......
This diff is collapsed.
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
} }
Tooltip.prototype.enter = function (e) { Tooltip.prototype.enter = function (e) {
var defaults = $.fn[this.type].defaults var defaults = this.getDefaults()
var options = {} var options = {}
this._options && $.each(this._options, function (key, value) { this._options && $.each(this._options, function (key, value) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment