Merge branch 'master' into hash

This commit is contained in:
timwis
2016-06-04 19:25:12 -04:00
3 changed files with 10 additions and 2 deletions
+5
View File
@@ -33,6 +33,11 @@
<img src="https://img.shields.io/codecov/c/github/yoshuawuyts/choo/master.svg?style=flat-square" <img src="https://img.shields.io/codecov/c/github/yoshuawuyts/choo/master.svg?style=flat-square"
alt="Test Coverage" /> alt="Test Coverage" />
</a> </a>
<!-- Downloads -->
<a href="https://npmjs.org/package/choo">
<img src="https://img.shields.io/npm/dm/choo.svg?style=flat-square"
alt="Downloads" />
</a>
<!-- Standard --> <!-- Standard -->
<a href="https://codecov.io/github/yoshuawuyts/choo"> <a href="https://codecov.io/github/yoshuawuyts/choo">
<img src="https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square" <img src="https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square"
+4 -1
View File
@@ -54,7 +54,10 @@ function choo () {
// start the application // start the application
// (str?, obj?) -> DOMNode // (str?, obj?) -> DOMNode
function start (rootId, opts) { function start (rootId, opts) {
if (!opts) opts = rootId if (!opts) {
opts = rootId
rootId = null
}
opts = opts || {} opts = opts || {}
const name = opts.name || 'choo' const name = opts.name || 'choo'
const initialState = {} const initialState = {}
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "choo", "name": "choo",
"version": "2.1.4", "version": "2.1.6",
"description": "A 7kb framework for creating sturdy frontend applications", "description": "A 7kb framework for creating sturdy frontend applications",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {