Skip to content

Revert todos-with-undo being ported 0.14 #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2015
Merged

Revert todos-with-undo being ported 0.14 #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e21547
Revert "update TodoList example to react 0.14"
gaearon Oct 12, 2015
7b44118
Revert "todos-with-undo: upgrade dependencies, update to react 0.14"
gaearon Oct 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/basics/ExampleTodoList.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ This is the complete source code of the tiny todo app we built during the [basic

```js
import React from 'react';
import ReactDOM from 'react-dom';
import { createStore } from 'redux';
import { Provider } from 'react-redux';
import App from './containers/App';
Expand All @@ -17,9 +16,11 @@ import todoApp from './reducers';
let store = createStore(todoApp);

let rootElement = document.getElementById('root');
ReactDOM.render(
React.render(
// The child must be wrapped in a function
// to work around an issue in React 0.13.
<Provider store={store}>
<App />
{() => <App />}
</Provider>,
rootElement
);
Expand Down Expand Up @@ -189,8 +190,7 @@ export default connect(select)(App);
#### `components/AddTodo.js`

```js
import React, { Component, PropTypes } from 'react';
import { findDOMNode } from 'react-dom';
import React, { findDOMNode, Component, PropTypes } from 'react';

export default class AddTodo extends Component {
render() {
Expand Down
3 changes: 1 addition & 2 deletions examples/todos-with-undo/components/AddTodo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { Component, PropTypes } from 'react';
import { findDOMNode } from 'react-dom';
import React, { findDOMNode, Component, PropTypes } from 'react';

export default class AddTodo extends Component {
handleClick() {
Expand Down
5 changes: 2 additions & 3 deletions examples/todos-with-undo/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { createStore } from 'redux';
import { Provider } from 'react-redux';
import App from './containers/App';
Expand All @@ -8,9 +7,9 @@ import todoApp from './reducers';
const store = createStore(todoApp);

const rootElement = document.getElementById('root');
ReactDOM.render(
React.render(
<Provider store={store}>
<App />
{() => <App />}
</Provider>,
rootElement
);
29 changes: 14 additions & 15 deletions examples/todos-with-undo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,25 @@
},
"homepage": "http://rackt.github.io/redux",
"dependencies": {
"react": "^0.14.0",
"react-dom": "^0.14.0",
"react-redux": "^3.1.0",
"redux": "^3.0.2",
"redux-thunk": "^1.0.0",
"react": "^0.13.3",
"react-redux": "^2.1.2",
"redux": "^3.0.0",
"redux-thunk": "^0.1.0",
"redux-undo": "^0.5.0"
},
"devDependencies": {
"babel-core": "^5.8.25",
"babel-loader": "^5.3.2",
"babel-plugin-react-transform": "^1.1.1",
"expect": "^1.12.1",
"babel-core": "^5.6.18",
"babel-loader": "^5.1.4",
"babel-plugin-react-transform": "^1.1.0",
"expect": "^1.6.0",
"express": "^4.13.3",
"jsdom": "^6.5.1",
"mocha": "^2.3.3",
"jsdom": "^5.6.1",
"mocha": "^2.2.5",
"mocha-jsdom": "^1.0.0",
"node-libs-browser": "^0.5.3",
"react-transform-hmr": "^1.0.1",
"webpack": "^1.12.2",
"node-libs-browser": "^0.5.2",
"react-transform-hmr": "^1.0.0",
"webpack": "^1.9.11",
"webpack-dev-middleware": "^1.2.0",
"webpack-hot-middleware": "^2.4.1"
"webpack-hot-middleware": "^2.2.0"
}
}