Skip to content
GitLab
Commit 380e2005 authored by XhmikosR's avatar XhmikosR
Browse files

Merge pull request #17436 from twbs/v4-dev-xmr-deps 

Update dependecies.
parents 07286c98 f0840c89
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 122 additions and 92 deletions
+122 -92
Gruntfile.js
+ 1
- 1
View file @ 380e2005
......@@ -337,7 +337,7 @@ module.exports = function (grunt) {
options: {
ignore: [
'Element “img” is missing required attribute “src”.',
'Attribute “autocomplete” not allowed on element “input” at this point.',
'Attribute “autocomplete” is only allowed when the input type is “color”, “date”, “datetime”, “datetime-local”, “email”, “month”, “number”, “password”, “range”, “search”, “tel”, “text”, “time”, “url”, or “week”.',
'Attribute “autocomplete” not allowed on element “button” at this point.',
'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)',
'Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).',
......
dist/css/bootstrap.min.css
+ 1
- 1
View file @ 380e2005
This diff is collapsed.
dist/css/bootstrap.min.css.map
-687 bytes (-2%)
View file @ 380e2005
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
dist/js/bootstrap.js
+ 27
- 18
View file @ 380e2005
......@@ -2058,7 +2058,7 @@ var Modal = (function ($) {
this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) {
document.body.style.paddingRight = bodyPadding + (this._scrollbarWidth + 'px');
document.body.style.paddingRight = bodyPadding + this._scrollbarWidth + 'px';
}
}
}, {
......@@ -2766,7 +2766,7 @@ var Tooltip = (function ($) {
var DefaultType = {
animation: 'boolean',
template: 'string',
title: '(string|function)',
title: '(string|element|function)',
trigger: 'string',
delay: '(number|object)',
html: 'boolean',
......@@ -3052,16 +3052,31 @@ var Tooltip = (function ($) {
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var method = this.config.html ? 'html' : 'text';
var $tip = $(this.getTipElement());
$(tip).find(Selector.TOOLTIP_INNER)[method](title);
this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}
}, {
key: 'setElementContent',
value: function setElementContent($element, content) {
var html = this.config.html;
if (typeof content === 'object' && (content.nodeType || content.jquery)) {
// content is a DOM node or a jQuery
if (html) {
if (!$(content).parent().is($element)) {
$element.empty().append(content);
}
} else {
$element.text($(content).text());
}
} else {
$element[html ? 'html' : 'text'](content);
}
}
}, {
key: 'getTitle',
value: function getTitle() {
......@@ -3351,7 +3366,7 @@ var Popover = (function ($) {
});
var DefaultType = $.extend({}, Tooltip.DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});
var ClassName = {
......@@ -3415,19 +3430,13 @@ var Popover = (function ($) {
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var content = this._getContent();
var $titleElement = $(tip).find(Selector.TITLE);
if ($titleElement) {
$titleElement[this.config.html ? 'html' : 'text'](title);
}
var $tip = $(this.getTipElement());
// we use append for html objects to maintain js events
$(tip).find(Selector.CONTENT).children().detach().end()[this.config.html ? typeof content === 'string' ? 'html' : 'append' : 'text'](content);
this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}
......
dist/js/bootstrap.min.js
+ 2
- 2
View file @ 380e2005
This diff is collapsed.
dist/js/umd/modal.js
+ 1
- 1
View file @ 380e2005
......@@ -444,7 +444,7 @@
this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) {
document.body.style.paddingRight = bodyPadding + (this._scrollbarWidth + 'px');
document.body.style.paddingRight = bodyPadding + this._scrollbarWidth + 'px';
}
}
}, {
......
dist/js/umd/popover.js
+ 5
- 11
View file @ 380e2005
......@@ -54,7 +54,7 @@
});
var DefaultType = $.extend({}, _Tooltip2['default'].DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});
var ClassName = {
......@@ -118,19 +118,13 @@
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var content = this._getContent();
var $titleElement = $(tip).find(Selector.TITLE);
if ($titleElement) {
$titleElement[this.config.html ? 'html' : 'text'](title);
}
var $tip = $(this.getTipElement());
// we use append for html objects to maintain js events
$(tip).find(Selector.CONTENT).children().detach().end()[this.config.html ? typeof content === 'string' ? 'html' : 'append' : 'text'](content);
this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}
......
dist/js/umd/tooltip.js
+ 21
- 6
View file @ 380e2005
......@@ -60,7 +60,7 @@
var DefaultType = {
animation: 'boolean',
template: 'string',
title: '(string|function)',
title: '(string|element|function)',
trigger: 'string',
delay: '(number|object)',
html: 'boolean',
......@@ -346,16 +346,31 @@
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var method = this.config.html ? 'html' : 'text';
var $tip = $(this.getTipElement());
$(tip).find(Selector.TOOLTIP_INNER)[method](title);
this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}
}, {
key: 'setElementContent',
value: function setElementContent($element, content) {
var html = this.config.html;
if (typeof content === 'object' && (content.nodeType || content.jquery)) {
// content is a DOM node or a jQuery
if (html) {
if (!$(content).parent().is($element)) {
$element.empty().append(content);
}
} else {
$element.text($(content).text());
}
} else {
$element[html ? 'html' : 'text'](content);
}
}
}, {
key: 'getTitle',
value: function getTitle() {
......
docs/assets/css/docs.min.css.map
+1 bytes (+0%)
View file @ 380e2005
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/assets/js/docs.min.js
+ 1
- 1
View file @ 380e2005
This diff is collapsed.
docs/dist/css/bootstrap.min.css
+ 1
- 1
View file @ 380e2005
This diff is collapsed.
docs/dist/css/bootstrap.min.css.map
-687 bytes (-2%)
View file @ 380e2005
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/dist/js/bootstrap.js
+ 27
- 18
View file @ 380e2005
......@@ -2058,7 +2058,7 @@ var Modal = (function ($) {
this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) {
document.body.style.paddingRight = bodyPadding + (this._scrollbarWidth + 'px');
document.body.style.paddingRight = bodyPadding + this._scrollbarWidth + 'px';
}
}
}, {
......@@ -2766,7 +2766,7 @@ var Tooltip = (function ($) {
var DefaultType = {
animation: 'boolean',
template: 'string',
title: '(string|function)',
title: '(string|element|function)',
trigger: 'string',
delay: '(number|object)',
html: 'boolean',
......@@ -3052,16 +3052,31 @@ var Tooltip = (function ($) {
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var method = this.config.html ? 'html' : 'text';
var $tip = $(this.getTipElement());
$(tip).find(Selector.TOOLTIP_INNER)[method](title);
this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}
}, {
key: 'setElementContent',
value: function setElementContent($element, content) {
var html = this.config.html;
if (typeof content === 'object' && (content.nodeType || content.jquery)) {
// content is a DOM node or a jQuery
if (html) {
if (!$(content).parent().is($element)) {
$element.empty().append(content);
}
} else {
$element.text($(content).text());
}
} else {
$element[html ? 'html' : 'text'](content);
}
}
}, {
key: 'getTitle',
value: function getTitle() {
......@@ -3351,7 +3366,7 @@ var Popover = (function ($) {
});
var DefaultType = $.extend({}, Tooltip.DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});
var ClassName = {
......@@ -3415,19 +3430,13 @@ var Popover = (function ($) {
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var content = this._getContent();
var $titleElement = $(tip).find(Selector.TITLE);
if ($titleElement) {
$titleElement[this.config.html ? 'html' : 'text'](title);
}
var $tip = $(this.getTipElement());
// we use append for html objects to maintain js events
$(tip).find(Selector.CONTENT).children().detach().end()[this.config.html ? typeof content === 'string' ? 'html' : 'append' : 'text'](content);
this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}
......
docs/dist/js/bootstrap.min.js
+ 2
- 2
View file @ 380e2005
This diff is collapsed.
docs/dist/js/umd/modal.js
+ 1
- 1
View file @ 380e2005
......@@ -444,7 +444,7 @@
this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) {
document.body.style.paddingRight = bodyPadding + (this._scrollbarWidth + 'px');
document.body.style.paddingRight = bodyPadding + this._scrollbarWidth + 'px';
}
}
}, {
......
docs/dist/js/umd/popover.js
+ 5
- 11
View file @ 380e2005
......@@ -54,7 +54,7 @@
});
var DefaultType = $.extend({}, _Tooltip2['default'].DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});
var ClassName = {
......@@ -118,19 +118,13 @@
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var content = this._getContent();
var $titleElement = $(tip).find(Selector.TITLE);
if ($titleElement) {
$titleElement[this.config.html ? 'html' : 'text'](title);
}
var $tip = $(this.getTipElement());
// we use append for html objects to maintain js events
$(tip).find(Selector.CONTENT).children().detach().end()[this.config.html ? typeof content === 'string' ? 'html' : 'append' : 'text'](content);
this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}
......
docs/dist/js/umd/tooltip.js
+ 21
- 6
View file @ 380e2005
......@@ -60,7 +60,7 @@
var DefaultType = {
animation: 'boolean',
template: 'string',
title: '(string|function)',
title: '(string|element|function)',
trigger: 'string',
delay: '(number|object)',
html: 'boolean',
......@@ -346,16 +346,31 @@
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var method = this.config.html ? 'html' : 'text';
var $tip = $(this.getTipElement());
$(tip).find(Selector.TOOLTIP_INNER)[method](title);
this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}
}, {
key: 'setElementContent',
value: function setElementContent($element, content) {
var html = this.config.html;
if (typeof content === 'object' && (content.nodeType || content.jquery)) {
// content is a DOM node or a jQuery
if (html) {
if (!$(content).parent().is($element)) {
$element.empty().append(content);
}
} else {
$element.text($(content).text());
}
} else {
$element[html ? 'html' : 'text'](content);
}
}
}, {
key: 'getTitle',
value: function getTitle() {
......
js/dist/modal.js
+ 1
- 1
View file @ 380e2005
......@@ -427,7 +427,7 @@ var Modal = (function ($) {
this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) {
document.body.style.paddingRight = bodyPadding + (this._scrollbarWidth + 'px');
document.body.style.paddingRight = bodyPadding + this._scrollbarWidth + 'px';
}
}
}, {
......
js/dist/modal.js.map
+0 bytes (+0%)
View file @ 380e2005
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/dist/popover.js
+ 5
- 11
View file @ 380e2005
......@@ -37,7 +37,7 @@ var Popover = (function ($) {
});
var DefaultType = $.extend({}, Tooltip.DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});
var ClassName = {
......@@ -101,19 +101,13 @@ var Popover = (function ($) {
}, {
key: 'setContent',
value: function setContent() {
var tip = this.getTipElement();
var title = this.getTitle();
var content = this._getContent();
var $titleElement = $(tip).find(Selector.TITLE);
if ($titleElement) {
$titleElement[this.config.html ? 'html' : 'text'](title);
}
var $tip = $(this.getTipElement());
// we use append for html objects to maintain js events
$(tip).find(Selector.CONTENT).children().detach().end()[this.config.html ? typeof content === 'string' ? 'html' : 'append' : 'text'](content);
this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$(tip).removeClass(ClassName.FADE).removeClass(ClassName.IN);
$tip.removeClass(ClassName.FADE).removeClass(ClassName.IN);
this.cleanupTether();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment