diff options
| author | Jon Stevens <latchkey@gmail.com> | 2012-07-23 01:19:11 +0400 |
|---|---|---|
| committer | Jon Stevens <latchkey@gmail.com> | 2012-07-23 01:19:11 +0400 |
| commit | 393f4a7b4244233a6ad24a48b68869329f4756b8 (patch) | |
| tree | 214420535f41144e13737d6de6308012b241d128 /js | |
| parent | 117f65d43108d5d7ff1c5011f0b8b61f7ef3b9dd (diff) | |
simplify things to one line. pull #4104
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-popover.js | 3 | ||||
| -rw-r--r-- | js/bootstrap-tooltip.js | 5 |
2 files changed, 4 insertions, 4 deletions
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') } } |