{"parents":["86eeef1ccd16936aeb56f53926dd600dbb736c5c","a52512863e07a70363768a2d5d8da79b869a7fd6"],"commit":{"revision":"6ed829ff9500437f4015e19c8f62950c8a2cc8ea","shortRevision":"6ed829ff95","authorEmail":"paul@oshannessy.com","authoredAt":"2013-05-30T11:54:14-07:00","authorName":"Paul O’Shannessy","subject":"Merge branch 'master' of github.com:facebook\/react"},"files":[{"path":"examples\/todomvc-backbone\/js\/app.js","status":"M"},{"path":"examples\/todomvc\/css\/base.css","status":"M"},{"path":"examples\/todomvc\/js\/app.js","status":"M"}],"body":"","patch":"diff --git a\/examples\/todomvc-backbone\/js\/app.js b\/examples\/todomvc-backbone\/js\/app.js\nindex b40f7e0ce0..6bf31c2618 100644\n--- a\/examples\/todomvc-backbone\/js\/app.js\n+++ b\/examples\/todomvc-backbone\/js\/app.js\n@@ -73,8 +73,6 @@ var Utils = {\n \n \/\/ Begin React stuff\n \n-var ENTER_KEY = 13;\n-\n var TodoItem = React.createClass({\n handleSubmit: React.autoBind(function(event) {\n var val = this.refs.editField.getDOMNode().value;\n@@ -180,12 +178,12 @@ var TodoApp = React.createClass({\n }\n return false;\n }),\n- toggleAll: function(event) {\n+ toggleAll: React.autoBind(function(event) {\n var checked = event.nativeEvent.target.checked;\n this.props.todos.map(function(todo) {\n todo.set('completed', checked);\n });\n- },\n+ }),\n destroy: function(todo) {\n this.props.todos.remove(todo);\n },\n@@ -196,11 +194,11 @@ var TodoApp = React.createClass({\n todo.set('title', text);\n this.setState({editing: null});\n },\n- clearCompleted: function() {\n+ clearCompleted: React.autoBind(function() {\n this.props.todos.completed().map(function(todo) {\n todo.destroy();\n });\n- },\n+ }),\n render: function() {\n var footer = null;\n var main = null;\n@@ -211,13 +209,13 @@ var TodoApp = React.createClass({\n var activeTodoCount = this.props.todos.remaining().length;\n var completedCount = todoItems.length - activeTodoCount;\n \t if (activeTodoCount || completedCount) {\n- footer = ;\n+ footer = ;\n }\n \n if (todoItems.length) {\n main = (\n

\n- \n+ \n Mark all as complete<\/label>\n

\n@@ -59,10 +54,13 @@ var TodoItem = React.createClass({\n checked={this.props.todo.completed ? 'checked' : null}\n onChange={this.props.onToggle}\n \/>\n- {this.props.todo.title}<\/label>\n+ {this.props.todo.title}<\/label>\n

dillon1000/react

Files changed