Skip to content

Commit

Permalink
Update for 0.12
Browse files Browse the repository at this point in the history
Fixes reactjs#6
Closes reactjs#8
  • Loading branch information
zpao committed Dec 10, 2014
1 parent 4b12746 commit be9179b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<title>Hello React</title>
<!-- Not present in the tutorial. Just for basic styling. -->
<link rel="stylesheet" href="css/base.css" />
<script src="http://cdnjs.cloudflare.com/ajax/libs/react/0.11.1/react.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/react/0.11.1/JSXTransformer.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/react/0.12.1/react.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/react/0.12.1/JSXTransformer.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/showdown/0.3.1/showdown.min.js"></script>
</head>
<body>
<div id="content"></div>
<script type="text/jsx" src="scripts/example.js"></script>
<script type="text/jsx;harmony=true" src="scripts/example.js"></script>
</body>
</html>
4 changes: 1 addition & 3 deletions public/scripts/example.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
* FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* @jsx React.DOM
*/

var converter = new Showdown.converter();
Expand Down Expand Up @@ -124,7 +122,7 @@ var CommentForm = React.createClass({
}
});

React.renderComponent(
React.render(
<CommentBox url="comments.json" pollInterval={2000} />,
document.getElementById('content')
);

0 comments on commit be9179b

Please sign in to comment.