diff options
| author | Mark Otto <[email protected]> | 2013-02-05 22:17:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 22:17:28 -0800 |
| commit | 0fe9148b91eff50b83100b6795fb49cf894caed1 (patch) | |
| tree | b8de9833bfbe2b50c094011cbf4c37be20eddaee /docs/assets/js/bootstrap-tooltip.js | |
| parent | 6a9cd513c02a6c156769d54910f1d3931da3e568 (diff) | |
| download | bootstrap-0fe9148b91eff50b83100b6795fb49cf894caed1.tar.xz bootstrap-0fe9148b91eff50b83100b6795fb49cf894caed1.zip | |
Fixes #6190: Add print utility classes
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 9ba2d1214..18e5b54f9 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 = { |