diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 0a3a7aa808..bad7208890 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -755,6 +755,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

.tooltip('toggle')

{{_i}}Toggles an element's tooltip.{{/i}}

$('#element').tooltip('toggle')
+

.tooltip('destroy')

+

{{_i}}Destroys an element's tooltip.{{/i}}

+
$('#element').tooltip('destroy')
@@ -821,7 +824,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { {{_i}}trigger{{/i}} {{_i}}string{{/i}} 'hover' - {{_i}}how tooltip is triggered{{/i}} - hover | focus | manual + {{_i}}how popover is triggered{{/i}} - hover | focus | manual {{_i}}title{{/i}} @@ -867,6 +870,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

.popover('toggle')

{{_i}}Toggles an elements popover.{{/i}}

$('#element').popover('toggle')
+

.popover('popover')

+

{{_i}}Destroys an element's popover.{{/i}}

+
$('#element').popover('destroy')
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index c6c1f8b473..456b74bdd4 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -71,6 +71,12 @@ return this.$tip } + , destroy: function () { + var $e = this.$element + $e.off() + $e.removeData('popover') + } + }) diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index f5f9fad3f4..93525b8bd3 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -235,6 +235,12 @@ this[this.tip().hasClass('in') ? 'hide' : 'show']() } + , destroy: function () { + var $e = this.$element + $e.off() + $e.removeData('tooltip') + } + }