Skip to content

Commit 3d0ce5e

Browse files
committed
Merge pull request #158 from Sinewyk/fix_iso_example
update example because nuclear 1.1
2 parents 4aaad42 + de1278e commit 3d0ce5e

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

examples/isomorphic-flux-chat/client.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ ChatApp = NuclearAddons.provideReactor(ChatApp)
1212

1313
Chat.register(reactor)
1414

15-
// @todo: refactor to use new nuclear methods when 1.1 lands ?
16-
if (window.window.reactor_state !== null) {
17-
reactor.__state = Nuclear.Immutable.fromJS(window.reactor_state)
15+
if (window.reactor_state !== null) {
16+
reactor.loadState(window.reactor_state)
1817
} else {
1918
Chat.actions.receiveAll(reactor, mockData)
2019
}

examples/isomorphic-flux-chat/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
"license": "ISC",
88
"dependencies": {
99
"keymirror": "^0.1.1",
10-
"nuclear-js": "^1.0.5",
11-
"nuclear-js-react-addons": "jordangarcia/nuclear-js-react-addons#049fe3cd9bbd230ce51aec7b443c438ccd70dbc9",
10+
"nuclear-js": "^1.1.1",
11+
"nuclear-js-react-addons": "jordangarcia/nuclear-js-react-addons#051c39b10c4af9af7007216b06fccbdf79994529",
1212
"react": "^0.13.3",
1313
"yargs": "^3.15.0"
1414
},
1515
"devDependencies": {
1616
"babel-core": "^5.7.4",
1717
"babel-loader": "^5.3.2",
18-
"css-loader": "^0.14.5",
19-
"eslint": "^0.24.1",
18+
"css-loader": "^0.16.0",
19+
"eslint": "^1.2.0",
2020
"nodemon": "^1.3.7",
2121
"style-loader": "^0.12.3",
2222
"webpack": "^1.10.0"

examples/isomorphic-flux-chat/server.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ http.createServer(function(req, res) {
5757

5858
/**
5959
* Dehydrate reactor
60-
* @todo: refactor to use new nuclear methods when 1.1 lands ?
6160
*/
62-
var _state = JSON.stringify(reactor.__state.toJS())
61+
var _state = JSON.stringify(reactor.serialize())
6362
returnHtml = returnHtml.replace('window.reactor_state = null', 'window.reactor_state = ' + _state)
6463

6564
/**

0 commit comments

Comments
 (0)