From 0b8a2819201076a8e93cd387aecf13d8c419990e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 26 Nov 2016 19:17:23 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 35c22c59b..d871f4083 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -5,7 +5,7 @@ */ if (typeof jQuery === 'undefined') { - throw new Error('Bootstrap\'s JavaScript requires jQuery') + throw new Error('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.') } +function ($) { @@ -2732,7 +2732,8 @@ var Tooltip = function ($) { selector: false, placement: 'top', offset: '0 0', - constraints: [] + constraints: [], + container: false }; var DefaultType = { @@ -2745,7 +2746,8 @@ var Tooltip = function ($) { selector: '(string|boolean)', placement: '(string|function)', offset: 'string', - constraints: 'array' + constraints: 'array', + container: '(string|element|boolean)' }; var AttachmentMap = { @@ -2921,7 +2923,9 @@ var Tooltip = function ($) { var attachment = this._getAttachment(placement); - $(tip).data(this.constructor.DATA_KEY, this).appendTo(document.body); + var container = this.config.container === false ? document.body : $(this.config.container); + + $(tip).data(this.constructor.DATA_KEY, this).appendTo(container); $(this.element).trigger(this.constructor.Event.INSERTED); -- cgit v1.2.3