don't create new Tooltip/Popover objects just to destroy them immediately

diff --git a/js/popover.js b/js/popover.js
index ecd37ac233ad509eb15f6a1662d331fe613b0104..e313242e825b277eb2f6ae3ea468f80ac5ab3d21 100644 (file)
--- a/js/popover.js
+++ b/js/popover.js
@@ -96,6 +96,7 @@
     return this.each(function () {
       var $this   = $(this)
       var data    = $this.data('bs.popover')
+      if (!data && option === 'destroy') return
       var options = typeof option == 'object' && option
 
       if (!data) $this.data('bs.popover', (data = new Popover(this, options)))

diff --git a/js/tooltip.js b/js/tooltip.js
index 89802287a32cece7dcfd0d2543f652d3b7918d55..65006e24f2b6607f238e2900fce334a0a3fc24c0 100644 (file)
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -365,6 +365,7 @@
     return this.each(function () {
       var $this   = $(this)
       var data    = $this.data('bs.tooltip')
+      if (!data && option === 'destroy') return
       var options = typeof option == 'object' && option
 
       if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))