Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependecies. #17436

Merged
merged 3 commits into from Sep 5, 2015
Merged

Update dependecies. #17436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db86b0f
Update devDependencies.
XhmikosR Aug 26, 2015
a3d0a2c
Update htmllint rules for the new version.
XhmikosR Aug 26, 2015
f0840c8
Run `grunt`.
XhmikosR Aug 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Expand Up @@ -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).',
Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

45 changes: 27 additions & 18 deletions dist/js/bootstrap.js
View file
Open in desktop
Expand Up @@ -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';
}
}
}, {
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -3351,7 +3366,7 @@ var Popover = (function ($) {
});

var DefaultType = $.extend({}, Tooltip.DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});

var ClassName = {
Expand Down Expand Up @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions dist/js/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/umd/modal.js
View file
Open in desktop
Expand Up @@ -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';
}
}
}, {
Expand Down
16 changes: 5 additions & 11 deletions dist/js/umd/popover.js
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@
});

var DefaultType = $.extend({}, _Tooltip2['default'].DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});

var ClassName = {
Expand Down Expand Up @@ -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();
}
Expand Down
27 changes: 21 additions & 6 deletions dist/js/umd/tooltip.js
View file
Open in desktop
Expand Up @@ -60,7 +60,7 @@
var DefaultType = {
animation: 'boolean',
template: 'string',
title: '(string|function)',
title: '(string|element|function)',
trigger: 'string',
delay: '(number|object)',
html: 'boolean',
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/css/docs.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/js/docs.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/css/bootstrap.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

45 changes: 27 additions & 18 deletions docs/dist/js/bootstrap.js
View file
Open in desktop
Expand Up @@ -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';
}
}
}, {
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -3351,7 +3366,7 @@ var Popover = (function ($) {
});

var DefaultType = $.extend({}, Tooltip.DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});

var ClassName = {
Expand Down Expand Up @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions docs/dist/js/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/js/umd/modal.js
View file
Open in desktop
Expand Up @@ -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';
}
}
}, {
Expand Down
16 changes: 5 additions & 11 deletions docs/dist/js/umd/popover.js
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@
});

var DefaultType = $.extend({}, _Tooltip2['default'].DefaultType, {
content: '(string|function)'
content: '(string|element|function)'
});

var ClassName = {
Expand Down Expand Up @@ -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();
}
Expand Down
27 changes: 21 additions & 6 deletions docs/dist/js/umd/tooltip.js
View file
Open in desktop
Expand Up @@ -60,7 +60,7 @@
var DefaultType = {
animation: 'boolean',
template: 'string',
title: '(string|function)',
title: '(string|element|function)',
trigger: 'string',
delay: '(number|object)',
html: 'boolean',
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion js/dist/modal.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/dist/modal.js.map
View file
Open in desktop

Large diffs are not rendered by default.