diff options
| author | Mark Otto <[email protected]> | 2013-02-07 22:18:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-07 22:18:53 -0800 |
| commit | 2aa1a4dc706606e060525907574bb648b773f312 (patch) | |
| tree | baccd787bdbcf45a235c3a042c1510730a24b420 /js/tests/unit | |
| parent | a9729c5fd003abbfa0d1ab5bc318a069fd5b1382 (diff) | |
| parent | 8c7f9c66a7d12f47f50618ef420868fe836d0c33 (diff) | |
| download | bootstrap-2aa1a4dc706606e060525907574bb648b773f312.tar.xz bootstrap-2aa1a4dc706606e060525907574bb648b773f312.zip | |
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'js/tests/unit')
| -rw-r--r-- | js/tests/unit/bootstrap-tooltip.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js index 97571d243..5b37b4e68 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 () { |