fMerge branch '2.1.0-wip'

Conflicts:
	docs/index.html

1 files changed, 11 insertions, 22 deletions

diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
index 7b0c10de0..2eb8c8f7c 100644
--- a/js/tests/unit/bootstrap-tooltip.js
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -128,28 +128,17 @@ $(function () {
         }, 200)
       })
 
-      test("should detect if title string is html or text: foo", function () {
-        ok(!$.fn.tooltip.Constructor.prototype.isHTML('foo'), 'correctly detected html')
-      })
-
-      test("should detect if title string is html or text: <foo>", function () {
-        ok(!$.fn.tooltip.Constructor.prototype.isHTML('<foo>'), 'correctly detected html')
-      })
-
-      test("should detect if title string is html or text: <div>foo</div>", function () {
-        ok($.fn.tooltip.Constructor.prototype.isHTML('<div>foo</div>'), 'correctly detected html')
-      })
-
-      test("should detect if title string is html or text: asdfa&lt;div>foo&lt;/div>asdfasdf", function () {
-        ok($.fn.tooltip.Constructor.prototype.isHTML('asdfa<div>foo</div>asdfasdf'), 'correctly detected html')
-      })
-
-      test("should detect if title string is html or text: document.createElement('div')", function () {
-        ok($.fn.tooltip.Constructor.prototype.isHTML(document.createElement('div')), 'correctly detected html')
-      })
-
-      test("should detect if title string is html or text: $('&lt;div />)", function () {
-        ok($.fn.tooltip.Constructor.prototype.isHTML($('<div></div>')), 'correctly detected html')
+      test("should destroy tooltip", function () {
+        var tooltip = $('<div/>').tooltip().on('click.foo', function(){})
+        ok(tooltip.data('tooltip'), 'tooltip has data')
+        ok(tooltip.data('events').mouseover && tooltip.data('events').mouseout, 'tooltip has hover event')
+        ok(tooltip.data('events').click[0].namespace == 'foo', 'tooltip has extra click.foo event')
+        tooltip.tooltip('show')
+        tooltip.tooltip('destroy')
+        ok(!tooltip.hasClass('in'), 'tooltip is hidden')
+        ok(!tooltip.data('tooltip'), 'tooltip does not have data')
+        ok(tooltip.data('events').click[0].namespace == 'foo', 'tooltip still has click.foo')
+        ok(!tooltip.data('events').mouseover && !tooltip.data('events').mouseout, 'tooltip does not have any events')
       })
 
 })