simplify things to one line. pull #4104

diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 57420bb5d99498234cd8ebbdfdd8b2cad85645d7..2a2b298dca387e2a0a6b3226e3bbc50a81f9a8b5 100644 (file)
--- 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 f22aa8e6438af9d05e84fbcac3587dffee31bce2..fa1c9a6c53545463e22af3893689e5dc9c0b2237 100644 (file)
--- 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')
     }
 
   }