Skip to content

Commit 5276d75

Browse files
committed
Remove AsyncProps
1 parent e99a00e commit 5276d75

File tree

15 files changed

+9
-559
lines changed

15 files changed

+9
-559
lines changed

examples/async-data/app.css

Lines changed: 0 additions & 13 deletions
This file was deleted.

examples/async-data/app.js

Lines changed: 0 additions & 119 deletions
This file was deleted.

examples/async-data/index.html

Lines changed: 0 additions & 10 deletions
This file was deleted.

examples/async-data/spinner.gif

-30.2 KB
Binary file not shown.

examples/async-data/utils.js

Lines changed: 0 additions & 52 deletions
This file was deleted.

examples/huge-apps/app.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
import React from 'react';
22
import createHistory from 'history/lib/createHashHistory';
33
import { Router } from 'react-router';
4-
import AsyncProps from 'react-router/lib/experimental/AsyncProps';
54
import stubbedCourses from './stubs/COURSES';
65

76
var rootRoute = {
8-
component: AsyncProps,
9-
10-
// iunno?
11-
renderInitialLoad() {
12-
return <div>loading...</div>
13-
},
14-
7+
component: 'div',
158
childRoutes: [{
169
path: '/',
1710
component: require('./components/App'),
@@ -28,9 +21,5 @@ var rootRoute = {
2821
var history = createHistory();
2922

3023
React.render((
31-
<Router
32-
history={history}
33-
routes={rootRoute}
34-
createElement={AsyncProps.createElement}
35-
/>
24+
<Router history={history} routes={rootRoute} />
3625
), document.getElementById('example'));

examples/huge-apps/components/App.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,10 @@ import GlobalNav from './GlobalNav';
44

55
class App extends React.Component {
66

7-
static loadProps (params, cb) {
8-
console.log('App', 'loadProps');
9-
cb(null, { courses: COURSES });
10-
}
11-
127
render () {
13-
var { courses, loading } = this.props;
8+
var courses = COURSES;
149
return (
15-
<div style={{opacity: loading ? 0.66 : 1}}>
10+
<div>
1611
<GlobalNav/>
1712
<div style={{padding: 20}}>
1813
{this.props.children || <Dashboard courses={courses}/>}

examples/huge-apps/routes/Calendar/components/Calendar.js

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,10 @@ import React from 'react';
22

33
class Calendar extends React.Component {
44

5-
static loadProps(params, cb) {
6-
setTimeout(() => {
7-
cb(null, {
8-
events: [{
9-
id: 0, title: 'essay due'
10-
}]
11-
})
12-
}, 1000);
13-
}
14-
155
render () {
16-
var { events } = this.props;
6+
var events = [{
7+
id: 0, title: 'essay due'
8+
}];
179
return (
1810
<div>
1911
<h2>Calendar</h2>

examples/huge-apps/routes/Course/components/Course.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,8 @@ styles.sidebar = {
1414

1515
class Course extends React.Component {
1616

17-
static loadProps (params, cb) {
18-
console.log('Course', 'loadProps');
19-
setTimeout(() => cb(null, { course: COURSES[params.courseId] }), 1000);
20-
}
21-
2217
render () {
23-
var { course } = this.props;
18+
var course = COURSES[this.props.params.courseId];
2419
return (
2520
<div>
2621
<h2>{course.name}</h2>

examples/huge-apps/routes/Course/routes/Announcements/components/Sidebar.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,8 @@ import { Link } from 'react-router';
33

44
export default class AnnouncementsSidebar extends React.Component {
55

6-
static loadProps (params, cb) {
7-
console.log('AnnouncementsSidebar', 'loadProps');
8-
cb(null, {
9-
announcements: COURSES[params.courseId].announcements
10-
});
11-
}
12-
136
render () {
14-
var { announcements } = this.props;
15-
//var announcements = COURSES[this.props.params.courseId].announcements;
7+
var announcements = COURSES[this.props.params.courseId].announcements;
168
return (
179
<div>
1810
<h3>Sidebar Assignments</h3>

0 commit comments

Comments
 (0)