diff options
| author | XhmikosR <[email protected]> | 2015-01-30 15:07:05 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2015-01-30 15:13:24 +0200 |
| commit | 8fd5718e71844d575e5a46144e30ec07fc325703 (patch) | |
| tree | abf003fe2ae27033f214ee3b069fa7e4248f40bd /docs/dist/js/bootstrap.js | |
| parent | 420088d3161fa7caf781afb1e6e553d0a42b99ef (diff) | |
| download | bootstrap-8fd5718e71844d575e5a46144e30ec07fc325703.tar.xz bootstrap-8fd5718e71844d575e5a46144e30ec07fc325703.zip | |
Run `grunt`.
Diffstat (limited to 'docs/dist/js/bootstrap.js')
| -rw-r--r-- | docs/dist/js/bootstrap.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 4139b6fc3..5430993de 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -1279,6 +1279,10 @@ if (typeof jQuery === 'undefined') { this.options = this.getOptions(options) this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport) + if (this.$element[0] instanceof document.constructor && !this.options.selector) { + throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!'); + } + var triggers = this.options.trigger.split(' ') for (var i = triggers.length; i--;) { @@ -1499,10 +1503,10 @@ if (typeof jQuery === 'undefined') { this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical) } - Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) { + Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) { this.arrow() - .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') - .css(isHorizontal ? 'top' : 'left', '') + .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') + .css(isVertical ? 'top' : 'left', '') } Tooltip.prototype.setContent = function () { @@ -2078,7 +2082,7 @@ if (typeof jQuery === 'undefined') { element.removeClass('fade') } - if (element.parent('.dropdown-menu')) { + if (element.parent('.dropdown-menu').length) { element .closest('li.dropdown') .addClass('active') |
