diff options
| author | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
|---|---|---|
| committer | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
| commit | e481c8fff268a1cce1fe0d60dc85d4f6b85e855e (patch) | |
| tree | 361d07f1cbe685332826d6cb6b291243a939df30 /js/src/popover.js | |
| parent | 026682bf0dc828d8d689cb01e623eb311de0c013 (diff) | |
| parent | 232469549c9a9b6082b311f568556d99ea03af2f (diff) | |
| download | bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.tar.xz bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.zip | |
Merge branch 'v4-dev' into v4-media-breakpoint-between
Diffstat (limited to 'js/src/popover.js')
| -rw-r--r-- | js/src/popover.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/src/popover.js b/js/src/popover.js index 30c0e4acb..99e48e64f 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -116,12 +116,12 @@ const Popover = (($) => { let tip = this.getTipElement() let title = this.getTitle() let content = this._getContent() - let titleElement = $(tip).find(Selector.TITLE)[0] + let $titleElement = $(tip).find(Selector.TITLE) - if (titleElement) { - titleElement[ - this.config.html ? 'innerHTML' : 'innerText' - ] = title + if ($titleElement) { + $titleElement[ + this.config.html ? 'html' : 'text' + ](title) } // we use append for html objects to maintain js events |