2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

al tests passing, dist rebuilt, w/typechecker

This commit is contained in:
fat
2015-05-13 14:52:46 -07:00
parent eaab1def7a
commit 6b2b0ed32f
16 changed files with 308 additions and 63 deletions
+1 -1
View File
@@ -39,7 +39,7 @@ var Carousel = (function ($) {
interval: '(number|boolean)',
keyboard: 'boolean',
slide: '(boolean|string)',
pause: 'string',
pause: '(string|boolean)',
wrap: 'boolean'
};
+1 -1
View File
File diff suppressed because one or more lines are too long
+3 -3
View File
@@ -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;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -27,12 +27,12 @@ const Collapse = (($) => {
const Default = {
toggle : true,
parent : null
parent : ''
}
const DefaultType = {
toggle : 'boolean',
parent : '(string|null)'
parent : 'string'
}
const Event = {
+3 -1
View File
@@ -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".'