Merge branch 'master' of github.com:sliptree/bootstrap-tokenfield

This commit is contained in:
Illimar Tambek
2014-03-18 18:57:47 +02:00
2 changed files with 4 additions and 4 deletions

View File

@@ -15,7 +15,7 @@
"homepage": "http://sliptree.github.io/bootstrap-tokenfield/",
"main": [
"dist/bootstrap-tokenfield.js",
"dist/bootstrap-tokenfield.css"
"dist/css/bootstrap-tokenfield.css"
],
"keywords": [
"jquery",
@@ -37,4 +37,4 @@
"chai": "~1.7.*",
"typeahead.js": "~0.10.1"
}
}
}

View File

@@ -17,6 +17,6 @@ For now - simply do `npm test`.
### Writing tests
Take care to follow the style of existing tests. ALl tests that require DOM
Take care to follow the style of existing tests. All tests that require DOM
manipulation and/or involve simulating user interaction, should go under
integration tests. Testing tokenfield methods should go under unit tests.
integration tests. Testing tokenfield methods should go under unit tests.