diff options
| author | fat <jacobthornton@gmail.com> | 2013-02-06 10:30:54 +0400 |
|---|---|---|
| committer | fat <jacobthornton@gmail.com> | 2013-02-06 10:30:54 +0400 |
| commit | 3b56227553f40cc567e161c68c64f1e315fd5241 (patch) | |
| tree | 0ecd914f0c395b277dc46300733d8bc05ab4802e /docs/assets/js/bootstrap-tooltip.js | |
| parent | 481428154084a9fafd31d8654157d6f6f78231d0 (diff) | |
| parent | accfdaafdbfc172f4d8358bbab820a9862bd8eb9 (diff) | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/assets/js/bootstrap-tooltip.js')
| -rw-r--r-- | docs/assets/js/bootstrap-tooltip.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 7a1d7254fc..915a87ea89 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -67,7 +67,7 @@ } , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) + options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options) if (options.delay && typeof options.delay == 'number') { options.delay = { |