diff options
| author | Jacob <[email protected]> | 2013-12-26 18:25:29 -0800 |
|---|---|---|
| committer | Jacob <[email protected]> | 2013-12-26 18:25:29 -0800 |
| commit | 6baf266cdaf150de5f7deddb6d410cb8cb8de52a (patch) | |
| tree | 27326878b995afc65e0153bb2225fc23cc944f1a | |
| parent | 39091b0748d9825ec415a57a984a8b96a9fe2abe (diff) | |
| parent | f350d1ba3df6f477203d721a213d4f9a753aa17d (diff) | |
| download | bootstrap-6baf266cdaf150de5f7deddb6d410cb8cb8de52a.tar.xz bootstrap-6baf266cdaf150de5f7deddb6d410cb8cb8de52a.zip | |
Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
don't create new Tooltip/Popover objects just to destroy them immediately
| -rw-r--r-- | js/popover.js | 1 | ||||
| -rw-r--r-- | js/tooltip.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/js/popover.js b/js/popover.js index df1a43d8d..84713bcc6 100644 --- a/js/popover.js +++ b/js/popover.js @@ -85,6 +85,7 @@ 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) $this.data('bs.popover', (data = new Popover(this, options))) diff --git a/js/tooltip.js b/js/tooltip.js index b465b9a8e..0d3086e9a 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -376,6 +376,7 @@ 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) $this.data('bs.tooltip', (data = new Tooltip(this, options))) |