Skip to content

B
bootstrap
Commit f0840c89 authored by XhmikosR's avatar XhmikosR
Browse files
Options

Run `grunt`.

parent a3d0a2c0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 97 deletions
dist/css/bootstrap.min.css
View file @ f0840c89
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/bootstrap.min.css.map
View file @ f0840c89
This diff was suppressed by a .gitattributes entry.
dist/js/bootstrap.js
View file @ f0840c89
...@@ -2058,7 +2058,7 @@ var Modal = (function ($) { ...@@ -2058,7 +2058,7 @@ var Modal = (function ($) {
this._originalBodyPadding = document.body.style.paddingRight || ''; this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) { 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 ($) { ...@@ -2766,7 +2766,7 @@ var Tooltip = (function ($) {
var DefaultType = { var DefaultType = {
animation: 'boolean', animation: 'boolean',
template: 'string', template: 'string',
title: '(string|function)', title: '(string|element|function)',
trigger: 'string', trigger: 'string',
delay: '(number|object)', delay: '(number|object)',
html: 'boolean', html: 'boolean',
...@@ -3052,16 +3052,31 @@ var Tooltip = (function ($) { ...@@ -3052,16 +3052,31 @@ var Tooltip = (function ($) {
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); var $tip = $(this.getTipElement());
var title = this.getTitle();
var method = this.config.html ? 'html' : 'text';
$(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(); 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', key: 'getTitle',
value: function getTitle() { value: function getTitle() {
...@@ -3351,7 +3366,7 @@ var Popover = (function ($) { ...@@ -3351,7 +3366,7 @@ var Popover = (function ($) {
}); });
var DefaultType = $.extend({}, Tooltip.DefaultType, { var DefaultType = $.extend({}, Tooltip.DefaultType, {
content: '(string|function)' content: '(string|element|function)'
}); });
var ClassName = { var ClassName = {
...@@ -3415,19 +3430,13 @@ var Popover = (function ($) { ...@@ -3415,19 +3430,13 @@ var Popover = (function ($) {
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); 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);
}
// we use append for html objects to maintain js events // 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(); this.cleanupTether();
} }
......
dist/js/bootstrap.min.js
View file @ f0840c89
This diff is collapsed.
dist/js/umd/modal.js
View file @ f0840c89
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
this._originalBodyPadding = document.body.style.paddingRight || ''; this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) { if (this._isBodyOverflowing) {
document.body.style.paddingRight = bodyPadding + (this._scrollbarWidth + 'px'); document.body.style.paddingRight = bodyPadding + this._scrollbarWidth + 'px';
} }
} }
}, { }, {
......
dist/js/umd/popover.js
View file @ f0840c89
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
}); });
var DefaultType = $.extend({}, _Tooltip2['default'].DefaultType, { var DefaultType = $.extend({}, _Tooltip2['default'].DefaultType, {
content: '(string|function)' content: '(string|element|function)'
}); });
var ClassName = { var ClassName = {
...@@ -118,19 +118,13 @@ ...@@ -118,19 +118,13 @@
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); 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);
}
// we use append for html objects to maintain js events // 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(); this.cleanupTether();
} }
......
dist/js/umd/tooltip.js
View file @ f0840c89
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
var DefaultType = { var DefaultType = {
animation: 'boolean', animation: 'boolean',
template: 'string', template: 'string',
title: '(string|function)', title: '(string|element|function)',
trigger: 'string', trigger: 'string',
delay: '(number|object)', delay: '(number|object)',
html: 'boolean', html: 'boolean',
...@@ -346,16 +346,31 @@ ...@@ -346,16 +346,31 @@
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); var $tip = $(this.getTipElement());
var title = this.getTitle();
var method = this.config.html ? 'html' : 'text';
$(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(); 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', key: 'getTitle',
value: function getTitle() { value: function getTitle() {
......
docs/assets/css/docs.min.css.map
View file @ f0840c89
This diff was suppressed by a .gitattributes entry.
docs/assets/js/docs.min.js
View file @ f0840c89
This diff is collapsed.
docs/dist/css/bootstrap.min.css
View file @ f0840c89
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/dist/css/bootstrap.min.css.map
View file @ f0840c89
This diff was suppressed by a .gitattributes entry.
docs/dist/js/bootstrap.js
View file @ f0840c89
...@@ -2058,7 +2058,7 @@ var Modal = (function ($) { ...@@ -2058,7 +2058,7 @@ var Modal = (function ($) {
this._originalBodyPadding = document.body.style.paddingRight || ''; this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) { 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 ($) { ...@@ -2766,7 +2766,7 @@ var Tooltip = (function ($) {
var DefaultType = { var DefaultType = {
animation: 'boolean', animation: 'boolean',
template: 'string', template: 'string',
title: '(string|function)', title: '(string|element|function)',
trigger: 'string', trigger: 'string',
delay: '(number|object)', delay: '(number|object)',
html: 'boolean', html: 'boolean',
...@@ -3052,16 +3052,31 @@ var Tooltip = (function ($) { ...@@ -3052,16 +3052,31 @@ var Tooltip = (function ($) {
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); var $tip = $(this.getTipElement());
var title = this.getTitle();
var method = this.config.html ? 'html' : 'text';
$(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(); 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', key: 'getTitle',
value: function getTitle() { value: function getTitle() {
...@@ -3351,7 +3366,7 @@ var Popover = (function ($) { ...@@ -3351,7 +3366,7 @@ var Popover = (function ($) {
}); });
var DefaultType = $.extend({}, Tooltip.DefaultType, { var DefaultType = $.extend({}, Tooltip.DefaultType, {
content: '(string|function)' content: '(string|element|function)'
}); });
var ClassName = { var ClassName = {
...@@ -3415,19 +3430,13 @@ var Popover = (function ($) { ...@@ -3415,19 +3430,13 @@ var Popover = (function ($) {
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); 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);
}
// we use append for html objects to maintain js events // 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(); this.cleanupTether();
} }
......
docs/dist/js/bootstrap.min.js
View file @ f0840c89
This diff is collapsed.
docs/dist/js/umd/modal.js
View file @ f0840c89
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
this._originalBodyPadding = document.body.style.paddingRight || ''; this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) { 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
View file @ f0840c89
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
}); });
var DefaultType = $.extend({}, _Tooltip2['default'].DefaultType, { var DefaultType = $.extend({}, _Tooltip2['default'].DefaultType, {
content: '(string|function)' content: '(string|element|function)'
}); });
var ClassName = { var ClassName = {
...@@ -118,19 +118,13 @@ ...@@ -118,19 +118,13 @@
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); 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);
}
// we use append for html objects to maintain js events // 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(); this.cleanupTether();
} }
......
docs/dist/js/umd/tooltip.js
View file @ f0840c89
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
var DefaultType = { var DefaultType = {
animation: 'boolean', animation: 'boolean',
template: 'string', template: 'string',
title: '(string|function)', title: '(string|element|function)',
trigger: 'string', trigger: 'string',
delay: '(number|object)', delay: '(number|object)',
html: 'boolean', html: 'boolean',
...@@ -346,16 +346,31 @@ ...@@ -346,16 +346,31 @@
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); var $tip = $(this.getTipElement());
var title = this.getTitle();
var method = this.config.html ? 'html' : 'text';
$(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(); 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', key: 'getTitle',
value: function getTitle() { value: function getTitle() {
......
js/dist/modal.js
View file @ f0840c89
...@@ -427,7 +427,7 @@ var Modal = (function ($) { ...@@ -427,7 +427,7 @@ var Modal = (function ($) {
this._originalBodyPadding = document.body.style.paddingRight || ''; this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) { if (this._isBodyOverflowing) {
document.body.style.paddingRight = bodyPadding + (this._scrollbarWidth + 'px'); document.body.style.paddingRight = bodyPadding + this._scrollbarWidth + 'px';
} }
} }
}, { }, {
......
js/dist/modal.js.map
View file @ f0840c89
This diff was suppressed by a .gitattributes entry.
js/dist/popover.js
View file @ f0840c89
...@@ -37,7 +37,7 @@ var Popover = (function ($) { ...@@ -37,7 +37,7 @@ var Popover = (function ($) {
}); });
var DefaultType = $.extend({}, Tooltip.DefaultType, { var DefaultType = $.extend({}, Tooltip.DefaultType, {
content: '(string|function)' content: '(string|element|function)'
}); });
var ClassName = { var ClassName = {
...@@ -101,19 +101,13 @@ var Popover = (function ($) { ...@@ -101,19 +101,13 @@ var Popover = (function ($) {
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); 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);
}
// we use append for html objects to maintain js events // 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(); this.cleanupTether();
} }
......
js/dist/popover.js.map
View file @ f0840c89
This diff was suppressed by a .gitattributes entry.
js/dist/tooltip.js
View file @ f0840c89
...@@ -43,7 +43,7 @@ var Tooltip = (function ($) { ...@@ -43,7 +43,7 @@ var Tooltip = (function ($) {
var DefaultType = { var DefaultType = {
animation: 'boolean', animation: 'boolean',
template: 'string', template: 'string',
title: '(string|function)', title: '(string|element|function)',
trigger: 'string', trigger: 'string',
delay: '(number|object)', delay: '(number|object)',
html: 'boolean', html: 'boolean',
...@@ -329,16 +329,31 @@ var Tooltip = (function ($) { ...@@ -329,16 +329,31 @@ var Tooltip = (function ($) {
}, { }, {
key: 'setContent', key: 'setContent',
value: function setContent() { value: function setContent() {
var tip = this.getTipElement(); var $tip = $(this.getTipElement());
var title = this.getTitle();
var method = this.config.html ? 'html' : 'text';
$(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(); 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', key: 'getTitle',
value: function getTitle() { value: function getTitle() {
......
js/dist/tooltip.js.map
View file @ f0840c89
This diff was suppressed by a .gitattributes entry.
Markdown is supported
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