mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-15 01:55:46 +02:00
al tests passing, dist rebuilt, w/typechecker
This commit is contained in:
2
js/dist/carousel.js
vendored
2
js/dist/carousel.js
vendored
@@ -39,7 +39,7 @@ var Carousel = (function ($) {
|
||||
interval: '(number|boolean)',
|
||||
keyboard: 'boolean',
|
||||
slide: '(boolean|string)',
|
||||
pause: 'string',
|
||||
pause: '(string|boolean)',
|
||||
wrap: 'boolean'
|
||||
};
|
||||
|
||||
|
2
js/dist/carousel.js.map
vendored
2
js/dist/carousel.js.map
vendored
File diff suppressed because one or more lines are too long
6
js/dist/collapse.js
vendored
6
js/dist/collapse.js
vendored
@@ -29,12 +29,12 @@ var Collapse = (function ($) {
|
||||
|
||||
var Default = {
|
||||
toggle: true,
|
||||
parent: null
|
||||
parent: ''
|
||||
};
|
||||
|
||||
var DefaultType = {
|
||||
toggle: 'boolean',
|
||||
parent: '(string|null)'
|
||||
parent: 'string'
|
||||
};
|
||||
|
||||
var Event = {
|
||||
@@ -241,7 +241,7 @@ var Collapse = (function ($) {
|
||||
|
||||
value: function _getConfig(config) {
|
||||
config = $.extend({}, Default, config);
|
||||
config.toggle = !!config.toggle;
|
||||
config.toggle = !!config.toggle; // coerce string values
|
||||
Util.typeCheckConfig(NAME, config, DefaultType);
|
||||
return config;
|
||||
}
|
||||
|
2
js/dist/collapse.js.map
vendored
2
js/dist/collapse.js.map
vendored
File diff suppressed because one or more lines are too long
@@ -27,12 +27,12 @@ const Collapse = (($) => {
|
||||
|
||||
const Default = {
|
||||
toggle : true,
|
||||
parent : null
|
||||
parent : ''
|
||||
}
|
||||
|
||||
const DefaultType = {
|
||||
toggle : 'boolean',
|
||||
parent : '(string|null)'
|
||||
parent : 'string'
|
||||
}
|
||||
|
||||
const Event = {
|
||||
|
@@ -33,6 +33,8 @@ $(function () {
|
||||
})
|
||||
|
||||
QUnit.test('should type check config options', function (assert) {
|
||||
assert.expect(2)
|
||||
|
||||
var message
|
||||
var expectedMessage = 'CAROUSEL: Option "interval" provided type "string" but expected type "(number|boolean)".'
|
||||
var config = {
|
||||
@@ -48,7 +50,7 @@ $(function () {
|
||||
assert.ok(message === expectedMessage, 'correct error message')
|
||||
|
||||
config = {
|
||||
keyboard: $('div')
|
||||
keyboard: document.createElement('div')
|
||||
}
|
||||
expectedMessage = 'CAROUSEL: Option "keyboard" provided type "element" but expected type "boolean".'
|
||||
|
||||
|
Reference in New Issue
Block a user