diff options
| author | fat <[email protected]> | 2013-02-07 19:47:01 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-02-07 19:47:01 -0800 |
| commit | 1bf070b4ce5ee40e4d248053d109c179bb42caf9 (patch) | |
| tree | 1a0b056458f535457f362bd8cbabfded837b5aab /docs/assets/js/bootstrap.js | |
| parent | d8a7a380bcfd25c66ca1dc54d1619dc272f4bbb4 (diff) | |
| parent | e3f3542d0b57fdcea0fbff2858b610f85a988d1d (diff) | |
| download | bootstrap-1bf070b4ce5ee40e4d248053d109c179bb42caf9.tar.xz bootstrap-1bf070b4ce5ee40e4d248053d109c179bb42caf9.zip | |
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.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index ed1421179..5f0fc199d 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1289,7 +1289,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', '') } } |