Merge pull request facebook#245 from gajus/master

react/lib/cx has been deprecated
harrykiselev · Jul 29, 2015 · a2dd0d8 · a2dd0d8
2 parents ac92a45 + 58d30a6
commit a2dd0d8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/examples/flux-chat/js/components/ThreadListItem.react.js b/examples/flux-chat/js/components/ThreadListItem.react.js
@@ -12,7 +12,7 @@
 
 var ChatThreadActionCreators = require('../actions/ChatThreadActionCreators');
 var React = require('react');
-var cx = require('react/lib/cx');
+var classNames = require('classnames');
 
 var ReactPropTypes = React.PropTypes;
 
@@ -28,7 +28,7 @@ var ThreadListItem = React.createClass({
     var lastMessage = thread.lastMessage;
     return (
       <li
-        className={cx({
+        className={classNames({
           'thread-list-item': true,
           'active': thread.id === this.props.currentThreadID
         })}

diff --git a/examples/flux-chat/package.json b/examples/flux-chat/package.json
@@ -5,6 +5,7 @@
   "repository": "https://github.com/facebook/flux",
   "main": "js/app.js",
   "dependencies": {
+    "classnames": "^2.1.3",
     "flux": "^2.0.0",
     "keymirror": "~0.1.0",
     "object-assign": "^1.0.0",

diff --git a/examples/flux-todomvc/js/components/TodoItem.react.js b/examples/flux-todomvc/js/components/TodoItem.react.js
@@ -12,7 +12,7 @@ var ReactPropTypes = React.PropTypes;
 var TodoActions = require('../actions/TodoActions');
 var TodoTextInput = require('./TodoTextInput.react');
 
-var cx = require('react/lib/cx');
+var classNames = require('classnames');
 
 var TodoItem = React.createClass({
 
@@ -49,7 +49,7 @@ var TodoItem = React.createClass({
     // in the naming of view actions toggleComplete() vs. destroyCompleted().
     return (
       <li
-        className={cx({
+        className={classNames({
           'completed': todo.complete,
           'editing': this.state.isEditing
         })}

diff --git a/examples/flux-todomvc/package.json b/examples/flux-todomvc/package.json
@@ -5,6 +5,7 @@
   "repository": "https://github.com/facebook/flux",
   "main": "js/app.js",
   "dependencies": {
+    "classnames": "^2.1.3",
     "flux": "^2.0.1",
     "keymirror": "~0.1.0",
     "object-assign": "^1.0.0",