Merge branch 'master' of github.com:reactjs/react-tutorial

hlinet · Nov 11, 2015 · 5928b75 · 5928b75
2 parents 2ddef37 + be3fa27
commit 5928b75
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 145 deletions.
diff --git a/README.md b/README.md
@@ -22,15 +22,6 @@ pip install -r requirements.txt
 python server.py
 ```
 
-### Haskell
-
-```sh
-cabal sandbox init
-cabal install --only-dependencies
-ghc Server.hs
-./Server
-```
-
 ### Ruby
 ```sh
 ruby server.rb
@@ -46,14 +37,6 @@ php server.php
 go run server.go
 ```
 
-### Lua
-
-```sh
-go get github.com/xyproto/algernon
-# or brew install algernon
-algernon server.lua
-```
-
 ### Perl
 
 ```sh

diff --git a/Server.hs b/Server.hs
diff --git a/public/scripts/example.js b/public/scripts/example.js
@@ -55,6 +55,7 @@ var CommentBox = React.createClass({
         this.setState({data: data});
       }.bind(this),
       error: function(xhr, status, err) {
+        this.setState({data: comments});
         console.error(this.props.url, status, err.toString());
       }.bind(this)
     });

diff --git a/react-scotty.cabal b/react-scotty.cabal
diff --git a/server.lua b/server.lua