namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880

2 files changed, 8 insertions, 4 deletions

diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js
index 6d5d9f7a1..290be827f 100644
--- a/js/tests/unit/bootstrap-popover.js
+++ b/js/tests/unit/bootstrap-popover.js
@@ -92,12 +92,14 @@ $(function () {
       })
 
       test("should destroy popover", function () {
-        var popover = $('<div/>').popover()
+        var popover = $('<div/>').popover().on('click.foo', function(){})
         ok(popover.data('popover'), 'popover has data')
         ok(popover.data('events').mouseover && popover.data('events').mouseout, 'popover has hover event')
+        ok(popover.data('events').click[0].namespace == 'foo', 'popover has extra click.foo event')
         popover.popover('destroy')
         ok(!popover.data('popover'), 'popover does not have data')
-        ok(!popover.data('events'), 'popover does not have any events')
+        ok(popover.data('events').click[0].namespace == 'foo', 'popover still has click.foo')
+        ok(!popover.data('events').mouseover && !popover.data('events').mouseout, 'popover does not have any events')
       })
       
 })
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
index 7852305c1..66bbeac7e 100644
--- a/js/tests/unit/bootstrap-tooltip.js
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -129,12 +129,14 @@ $(function () {
       })
 
       test("should destroy tooltip", function () {
-        var tooltip = $('<div/>').tooltip()
+        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('destroy')
         ok(!tooltip.data('tooltip'), 'tooltip does not have data')
-        ok(!tooltip.data('events'), 'tooltip does not have any events')
+        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')
       })
 
 })