From: fat <jacobthornton@gmail.com>
Date: Fri, 27 Dec 2013 02:27:43 +0000 (-0800)
Subject: update tool/pop destroy placement
X-Git-Tag: v3.1.0~136^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c73904e1728df9bfb6e6b7dfe3b3b732d066784;p=thirdparty%2Fbootstrap.git

update tool/pop destroy placement
---

diff --git a/js/popover.js b/js/popover.js
index 84713bcc68..1e8104c4fc 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 0d3086e9a7..d491fea0ea 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]()
     })