deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-06-13 11:22:46 +02:00
Code Issues Projects Releases Wiki Activity

Use Phantom for testing

Browse source
This commit is contained in:
Josh Johnson 2016-07-02 13:50:24 +01:00
parent a54edafef5
commit c8337f3f67
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/scripts/src/choices.js
View file

@ -117,7 +117,7 @@ export class Choices {
if (!cuttingTheMustard) console.error('Choices: Your browser doesn\'t support Choices'); if (!cuttingTheMustard) console.error('Choices: Your browser doesn\'t support Choices');
// Input type check // Input type check
const canInit = this.passedElement && isElement(this.passedElement) && ['select-one', 'select-multiple', 'text'].includes(this.passedElement.type); const canInit = this.passedElement && isElement(this.passedElement) && ['select-one', 'select-multiple', 'text'].some(type => type === this.passedElement.type);
if(canInit) { if(canInit) {
// If element has already been initalised with Choices // If element has already been initalised with Choices
@ -1434,7 +1434,7 @@ export class Choices {
this.itemList.innerHTML = ''; this.itemList.innerHTML = '';
// If we have items to add // If we have items to add
if(itemListFragment.children.length) { if(itemListFragment.children && itemListFragment.children.length) {
// Update list // Update list
this.itemList.appendChild(itemListFragment); this.itemList.appendChild(itemListFragment);
} }

3
package.json
View file

@ -37,9 +37,10 @@
"fuse.js": "^2.2.0", "fuse.js": "^2.2.0",
"jasmine-core": "^2.4.1", "jasmine-core": "^2.4.1",
"karma": "^1.1.0", "karma": "^1.1.0",
"karma-chrome-launcher": "^1.0.1",
"karma-coverage": "^1.0.0", "karma-coverage": "^1.0.0",
"karma-es6-shim": "^1.0.0",
"karma-jasmine": "^1.0.2", "karma-jasmine": "^1.0.2",
"karma-phantomjs-launcher": "^1.0.1",
"karma-spec-reporter": "0.0.26", "karma-spec-reporter": "0.0.26",
"karma-webpack": "^1.7.0", "karma-webpack": "^1.7.0",
"node-sass": "^3.4.2", "node-sass": "^3.4.2",

4
tests/karma.config.js
View file

@ -6,8 +6,8 @@ module.exports = function(config) {
files: [ files: [
'../tests/**/*_spec.js', '../tests/**/*_spec.js',
], ],
plugins: [webpack, 'karma-jasmine', 'karma-chrome-launcher', 'karma-coverage', 'karma-spec-reporter'], plugins: [webpack, 'karma-jasmine', 'karma-phantomjs-launcher', 'karma-coverage', 'karma-spec-reporter', 'es6-shim'],
browsers: ['Chrome'], browsers: ['PhantomJS'],
preprocessors: { preprocessors: {
'**/*_spec.js': ['webpack'], '**/*_spec.js': ['webpack'],
'src/**/*.js': ['webpack'] 'src/**/*.js': ['webpack']