From: Jon Stevens <latchkey@gmail.com>
Date: Sun, 22 Jul 2012 21:19:11 +0000 (-0700)
Subject: simplify things to one line. pull #4104
X-Git-Tag: v2.1.0~2^2~141^2~5^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=393f4a7b4244233a6ad24a48b68869329f4756b8;p=thirdparty%2Fbootstrap.git

simplify things to one line. pull #4104
---

diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 57420bb5d9..2a2b298dca 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -72,8 +72,7 @@
     }
 
   , destroy: function () {
-      this.hide()
-      this.$element.off(this.options.ns).removeData('popover')
+      this.hide().$element.off(this.options.ns).removeData('popover')
     }
 
   })
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index f22aa8e643..fa1c9a6c53 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -176,6 +176,8 @@
       $.support.transition && this.$tip.hasClass('fade') ?
         removeWithAnimation() :
         $tip.remove()
+        
+      return this
     }
 
   , fixTitle: function () {
@@ -236,8 +238,7 @@
     }
 
   , destroy: function () {
-      this.hide()
-      this.$element.off(this.options.ns).removeData('tooltip')
+      this.hide().$element.off(this.options.ns).removeData('tooltip')
     }
 
   }