mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-06 21:56:42 +02:00
Merge pull request #3880 from lookfirst/popover-destroy
Add popover / tooltip destroy method
This commit is contained in:
4
js/bootstrap-popover.js
vendored
4
js/bootstrap-popover.js
vendored
@@ -71,6 +71,10 @@
|
||||
return this.$tip
|
||||
}
|
||||
|
||||
, destroy: function () {
|
||||
this.$element.off().removeData('popover')
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
|
||||
|
4
js/bootstrap-tooltip.js
vendored
4
js/bootstrap-tooltip.js
vendored
@@ -235,6 +235,10 @@
|
||||
this[this.tip().hasClass('in') ? 'hide' : 'show']()
|
||||
}
|
||||
|
||||
, destroy: function () {
|
||||
this.$element.off().removeData('tooltip')
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
10
js/tests/unit/bootstrap-popover.js
vendored
10
js/tests/unit/bootstrap-popover.js
vendored
@@ -90,4 +90,14 @@ $(function () {
|
||||
ok(!$('.popover').length, 'popover was removed')
|
||||
$('#qunit-fixture').empty()
|
||||
})
|
||||
|
||||
test("should destroy popover", function () {
|
||||
var popover = $('<div/>').popover()
|
||||
ok(popover.data('popover'), 'popover has data')
|
||||
ok(popover.data('events').mouseover && popover.data('events').mouseout, 'popover has hover event')
|
||||
popover.popover('destroy')
|
||||
ok(!popover.data('popover'), 'popover does not have data')
|
||||
ok(!popover.data('events'), 'popover does not have any events')
|
||||
})
|
||||
|
||||
})
|
9
js/tests/unit/bootstrap-tooltip.js
vendored
9
js/tests/unit/bootstrap-tooltip.js
vendored
@@ -128,4 +128,13 @@ $(function () {
|
||||
}, 200)
|
||||
})
|
||||
|
||||
test("should destroy tooltip", function () {
|
||||
var tooltip = $('<div/>').tooltip()
|
||||
ok(tooltip.data('tooltip'), 'tooltip has data')
|
||||
ok(tooltip.data('events').mouseover && tooltip.data('events').mouseout, 'tooltip has hover event')
|
||||
tooltip.tooltip('destroy')
|
||||
ok(!tooltip.data('tooltip'), 'tooltip does not have data')
|
||||
ok(!tooltip.data('events'), 'tooltip does not have any events')
|
||||
})
|
||||
|
||||
})
|
||||
|
Reference in New Issue
Block a user