aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfat <[email protected]>2013-12-26 18:27:43 -0800
committerfat <[email protected]>2013-12-26 18:27:43 -0800
commit3c73904e1728df9bfb6e6b7dfe3b3b732d066784 (patch)
treec21f59a21f1d95241285020c5a974a372f7f5bcc
parent6baf266cdaf150de5f7deddb6d410cb8cb8de52a (diff)
downloadbootstrap-3c73904e1728df9bfb6e6b7dfe3b3b732d066784.tar.xz
bootstrap-3c73904e1728df9bfb6e6b7dfe3b3b732d066784.zip
update tool/pop destroy placement
-rw-r--r--js/popover.js2
-rw-r--r--js/tooltip.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/popover.js b/js/popover.js
index 84713bcc6..1e8104c4f 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -85,9 +85,9 @@
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 && option == 'destroy') return
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
if (typeof option == 'string') data[option]()
})
diff --git a/js/tooltip.js b/js/tooltip.js
index 0d3086e9a..d491fea0e 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -376,9 +376,9 @@
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 && option == 'destroy') return
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
if (typeof option == 'string') data[option]()
})