diff options
| author | Mark Otto <[email protected]> | 2013-07-17 23:34:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-17 23:34:31 -0700 |
| commit | 4d73aa60f953e0cb6c3b871d11a5c95617d0ca5b (patch) | |
| tree | 34e6536894ccc1a1fdd8d9a7d66c1a9b59e2b363 /docs/assets/js/bootstrap.js | |
| parent | d3a139622e50a5bbb29255eaca701d815dee716b (diff) | |
| parent | 59f847e8eef64c4adbc57a682ad626e068370b30 (diff) | |
| download | bootstrap-4d73aa60f953e0cb6c3b871d11a5c95617d0ca5b.tar.xz bootstrap-4d73aa60f953e0cb6c3b871d11a5c95617d0ca5b.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index fa0cec602..cf921cf2a 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1443,11 +1443,13 @@ } Popover.prototype.getContent = function () { - var content = typeof this.options.content == 'function' ? - this.options.content.call(this.$element[0]) : - this.options.content + var $e = this.$element + var o = this.options - return content || this.$element.attr('data-content') + return $e.attr('data-content') + || (typeof o.content == 'function' ? + o.content.call($e[0]) : + o.content) } Popover.prototype.tip = function () { |