aboutsummaryrefslogtreecommitdiff
path: root/js/popover.js
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-03-04 01:40:01 -0800
committerChris Rebert <[email protected]>2015-03-04 01:40:01 -0800
commit3c190908ca6d1bcc762bb22f7719fc951b51166f (patch)
tree5ef9b4e2c4c5b6d588e94939fcf56ba48362852b /js/popover.js
parent2f17289ab6665620c52a4a69750294f892a42e81 (diff)
parent27bbc7dbe93799730112cb786a859331ca193130 (diff)
downloadbootstrap-3c190908ca6d1bcc762bb22f7719fc951b51166f.tar.xz
bootstrap-3c190908ca6d1bcc762bb22f7719fc951b51166f.zip
Merge pull request #15988 from twbs/fix-15874
Hiding an uninitialized tooltip/popover no longer initializes it
Diffstat (limited to 'js/popover.js')
-rw-r--r--js/popover.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/popover.js b/js/popover.js
index 09be24433..479d059c5 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -85,7 +85,7 @@
var data = $this.data('bs.popover')
var options = typeof option == 'object' && option
- if (!data && option == 'destroy') return
+ if (!data && /destroy|hide/.test(option)) return
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
if (typeof option == 'string') data[option]()
})