Skip to content

Commit a284e34

Browse files
committed
Merge pull request #138 from bhamodi/master
Use passed in parameter instead of global variable.
2 parents 9b0c7bd + eef96ed commit a284e34

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

docs/src/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ updateSideBar()
1111
function render(component, id) {
1212
var el = document.getElementById(id)
1313
if (el) {
14-
React.render(React.createElement(ItemFilterExample), el)
14+
React.render(React.createElement(component), el)
1515
}
1616
}
1717

package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,28 @@
3434
"grunt-contrib-clean": "^0.6.0",
3535
"grunt-eslint": "^14.0.0",
3636
"grunt-githooks": "^0.3.1",
37-
"grunt-karma": "^0.11.0",
37+
"grunt-karma": "^0.12.0",
3838
"grunt-karma-coveralls": "^2.5.3",
3939
"istanbul": "^0.3.15",
4040
"istanbul-instrumenter-loader": "^0.1.3",
4141
"jasmine": "^2.3.1",
4242
"jasmine-core": "^2.3.4",
4343
"jstransform": "^11.0.1",
4444
"jstransform-loader": "^0.2.0",
45-
"karma": "^0.12.36",
46-
"karma-chrome-launcher": "^0.1.12",
45+
"karma": "^0.13.3",
46+
"karma-chrome-launcher": "^0.2.0",
4747
"karma-coverage": "^0.4.2",
4848
"karma-es5-shim": "https://github.com/pokehanai/karma-es5-shim/archive/v2.1.0.tar.gz",
49-
"karma-jasmine": "^0.3.5",
49+
"karma-jasmine": "^0.3.6",
5050
"karma-jasmine-html-reporter": "^0.1.8",
5151
"karma-phantomjs-launcher": "^0.2.0",
52-
"karma-sauce-launcher": "^0.2.11",
53-
"karma-webpack": "^1.5.1",
52+
"karma-sauce-launcher": "^0.2.14",
53+
"karma-webpack": "^1.7.0",
5454
"load-grunt-config": "^0.17.1",
5555
"lodash": "^3.9.3",
5656
"node-libs-browser": "^0.5.2",
5757
"phantomjs": "^1.9.17",
5858
"react": "^0.13.3",
59-
"webpack": "^1.9.11"
59+
"webpack": "^1.10.5"
6060
}
6161
}

tests/reactor-tests.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ describe('Reactor', () => {
10101010
initialize() {
10111011
this.on('add', (state, item) => state.push(toImmutable(item)))
10121012
this.on('error', (state, payload) => {
1013-
throw new Error('store error');
1013+
throw new Error('store error')
10141014
})
10151015
},
10161016
}),

0 commit comments

Comments
 (0)