diff options
| author | Mark Otto <otto@github.com> | 2013-02-08 10:18:53 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2013-02-08 10:18:53 +0400 |
| commit | 2aa1a4dc706606e060525907574bb648b773f312 (patch) | |
| tree | baccd787bdbcf45a235c3a042c1510730a24b420 /docs/assets/js/bootstrap-tooltip.js | |
| parent | a9729c5fd003abbfa0d1ab5bc318a069fd5b1382 (diff) | |
| parent | 8c7f9c66a7d12f47f50618ef420868fe836d0c33 (diff) | |
Merge branch 'master' into 3.0.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 9218d5d353..12a082f6f4 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -245,7 +245,7 @@ , fixTitle: function () { var $e = this.$element if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') } } |