mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

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

Browse Source 
Update dependecies.
This commit is contained in:
XhmikosR
2015-09-05 08:19:35 +03:00
parent 07286c98a9 f0840c893b
commit 380e200523
25 changed files with 712 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+1 -1
View File
@@ -337,7 +337,7 @@ module.exports = function (grunt) {
options: { options: {
ignore: [ ignore: [
'Element “img” is missing required attribute “src”.', '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.', '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.)', '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).', '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
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/js/bootstrap.js
+27 -18
View File
@@ -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 ($) {
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 ($) {
}, { }, {
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 ($) {
}); });
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 ($) {
}, { }, {
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
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
dist/js/umd/modal.js
Vendored
+1 -1
View File
@@ -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
Vendored
+5 -11
View File
@@ -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 @@
}, { }, {
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
Vendored
+21 -6
View File
@@ -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 @@
}, { }, {
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
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/docs.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/js/bootstrap.js
+27 -18
View File
@@ -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 ($) {
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 ($) {
}, { }, {
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 ($) {
}); });
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 ($) {
}, { }, {
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
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/dist/js/umd/modal.js
Vendored
+1 -1
View File
@@ -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
Vendored
+5 -11
View File
@@ -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 @@
}, { }, {
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
Vendored
+21 -6
View File
@@ -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 @@
}, { }, {
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
Vendored
+1 -1
View File
@@ -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
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/dist/popover.js
Vendored
+5 -11
View File
@@ -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 ($) {
}, { }, {
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
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/dist/tooltip.js
Vendored
+21 -6
View File
@@ -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 ($) {
}, { }, {
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
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
package.json
+19 -19
View File
@@ -28,41 +28,41 @@
}, },
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"babel-eslint": "^4.0.10", "babel-eslint": "^4.1.1",
"btoa": "~1.1.2", "btoa": "~1.1.2",
"glob": "~5.0.3", "glob": "~5.0.14",
"grunt": "~0.4.5", "grunt": "~0.4.5",
"grunt-autoprefixer": "~2.2.0", "grunt-autoprefixer": "~3.0.3",
"grunt-babel": "^5.0.0", "grunt-babel": "^5.0.1",
"grunt-build-control": "~0.2.0", "grunt-build-control": "~0.5.0",
"grunt-contrib-clean": "~0.6.0", "grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compress": "~0.13.0", "grunt-contrib-compress": "~0.13.0",
"grunt-contrib-concat": "~0.5.1", "grunt-contrib-concat": "~0.5.1",
"grunt-contrib-connect": "~0.9.0", "grunt-contrib-connect": "~0.11.2",
"grunt-contrib-copy": "~0.8.0", "grunt-contrib-copy": "~0.8.1",
"grunt-contrib-cssmin": "~0.12.2", "grunt-contrib-cssmin": "~0.13.0",
"grunt-contrib-qunit": "~0.5.2", "grunt-contrib-qunit": "~0.7.0",
"grunt-contrib-sass": "^0.8.1", "grunt-contrib-sass": "^0.9.2",
"grunt-contrib-uglify": "~0.8.0", "grunt-contrib-uglify": "~0.9.2",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~3.0.0", "grunt-csscomb": "~3.1.0",
"grunt-eslint": "^17.1.0", "grunt-eslint": "^17.1.0",
"grunt-exec": "~0.4.6", "grunt-exec": "~0.4.6",
"grunt-html": "~4.0.1", "grunt-html": "~5.0.0",
"grunt-jekyll": "~0.4.2", "grunt-jekyll": "~0.4.2",
"grunt-jscs": "~1.8.0", "grunt-jscs": "~1.8.0",
"grunt-line-remover": "0.0.2", "grunt-line-remover": "0.0.2",
"grunt-postcss": "^0.3.0", "grunt-postcss": "^0.6.0",
"grunt-sass": "^1.0.0", "grunt-sass": "^1.0.0",
"grunt-saucelabs": "~8.6.0", "grunt-saucelabs": "~8.6.1",
"grunt-scss-lint": "^0.3.4", "grunt-scss-lint": "^0.3.8",
"grunt-sed": "~0.1.1", "grunt-sed": "~0.1.1",
"grunt-stamp": "^0.1.0", "grunt-stamp": "^0.1.0",
"load-grunt-tasks": "~3.1.0", "load-grunt-tasks": "~3.2.0",
"markdown-it": "^4.0.1", "markdown-it": "^4.4.0",
"mq4-hover-shim": "^0.2.0", "mq4-hover-shim": "^0.2.0",
"npm-shrinkwrap": "^200.1.0", "npm-shrinkwrap": "^200.1.0",
"time-grunt": "^1.1.0" "time-grunt": "^1.2.1"
}, },
"engines": { "engines": {
"node": ">=0.10.1" "node": ">=0.10.1"
test-infra/npm-shrinkwrap.json
Generated
+544 -902
View File
File diff suppressed because it is too large Load Diff