diff options
author | fat <jacobthornton@gmail.com> | 2013-02-08 07:47:01 +0400 |
---|---|---|
committer | fat <jacobthornton@gmail.com> | 2013-02-08 07:47:01 +0400 |
commit | 1bf070b4ce5ee40e4d248053d109c179bb42caf9 (patch) | |
tree | 1a0b056458f535457f362bd8cbabfded837b5aab /js | |
parent | d8a7a380bcfd25c66ca1dc54d1619dc272f4bbb4 (diff) | |
parent | e3f3542d0b57fdcea0fbff2858b610f85a988d1d (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 'js')
-rw-r--r-- | js/bootstrap-tooltip.js | 2 | ||||
-rw-r--r-- | js/tests/unit/bootstrap-tooltip.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 915a87ea89..981319077e 100644 --- a/js/bootstrap-tooltip.js +++ b/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', '') } } diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js index 97571d243e..5b37b4e687 100644 --- a/js/tests/unit/bootstrap-tooltip.js +++ b/js/tests/unit/bootstrap-tooltip.js @@ -22,9 +22,9 @@ $(function () { ok(!!$.fn.tooltip.defaults, 'defaults is defined') }) - test("should remove title attribute", function () { + test("should empty title attribute", function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').tooltip() - ok(!tooltip.attr('title'), 'title tag was removed') + ok(tooltip.attr('title') === '', 'title attribute was emptied') }) test("should add data attribute for referencing original title", function () { |