Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8efb0b1

Browse files
committed
repair progress page loading
1 parent72b6fd8 commit8efb0b1

File tree

6 files changed

+39
-29
lines changed

6 files changed

+39
-29
lines changed

‎lib/components/Progress/ProgressPage/index.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ var __extends = (this && this.__extends) || function (d, b) {
55
d.prototype=b===null ?Object.create(b) :(__.prototype=b.prototype,new__());
66
};
77
varReact=require('react');
8+
varreact_redux_1=require('react-redux');
9+
varactions_1=require('../../../actions');
810
varprogressIcon_1=require('../progressIcon');
911
varList_1=require('material-ui/List');
1012
varcolors_1=require('material-ui/styles/colors');
@@ -29,5 +31,17 @@ var ProgressPage = (function (_super) {
2931
returnProgressPage;
3032
}(React.Component));
3133
;
34+
varmapStateToProps=function(state,props){return({
35+
progress:state.progress,
36+
pagePosition:state.pagePosition,
37+
page:props.page,
38+
index:props.index,
39+
});};
40+
varmapDispatchToProps=function(dispatch){return({
41+
selectPage:function(pagePosition){
42+
dispatch(actions_1.pageSet(pagePosition));
43+
dispatch(actions_1.routeSet('page'));
44+
}
45+
});};
3246
Object.defineProperty(exports,"__esModule",{value:true});
33-
exports.default=ProgressPage;
47+
exports.default=react_redux_1.connect(mapStateToProps,mapDispatchToProps)(ProgressPage);

‎lib/components/Progress/index.js‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ var Progress = (function (_super) {
2525
_super.apply(this,arguments);
2626
}
2727
Progress.prototype.render=function(){
28-
var_a=this.props,progress=_a.progress,pagePosition=_a.pagePosition,info=_a.info,tutorial=_a.tutorial,selectPage=_a.selectPage;
28+
var_a=this.props,info=_a.info,tutorial=_a.tutorial;
2929
return(React.createElement(Paper_1.default,{style:styles.page},
3030
React.createElement(List_1.List,{style:styles.list},
3131
React.createElement(Subheader_1.default,null,info.title),
32-
tutorial.pages.map(function(page,index){return(React.createElement(ProgressPage_1.default,{key:index,index:index,page:page,pagePosition:pagePosition,progress:progress,selectPage:selectPage}));}))
32+
tutorial.pages.map(function(page,index){return(React.createElement(ProgressPage_1.default,{key:index,index:index,page:page}));}))
3333
));
3434
};
3535
Progress.prototype.componentWillMount=function(){
@@ -38,17 +38,11 @@ var Progress = (function (_super) {
3838
returnProgress;
3939
}(React.Component));
4040
varmapStateToProps=function(state){return({
41-
progress:state.progress,
42-
pagePosition:state.pagePosition,
4341
info:state.tutorial.info,
4442
tutorial:state.tutorial,
4543
});};
46-
varmapDispatchToProps=function(dispatch){return({
47-
selectPage:function(pagePosition){
48-
dispatch(actions_1.pageSet(pagePosition));
49-
dispatch(actions_1.routeSet('page'));
50-
},
44+
varmapDispatchToProps={
5145
progressLoad:actions_1.progressLoad
52-
});};
46+
};
5347
Object.defineProperty(exports,"__esModule",{value:true});
5448
exports.default=react_redux_1.connect(mapStateToProps,mapDispatchToProps)(Progress);

‎lib/store.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ var reducers_1 = require('./reducers');
44
Object.defineProperty(exports,"__esModule",{value:true});
55
exports.default=configureStore_1.default({
66
reducer:reducers_1.default,
7-
devMode:false,
7+
devMode:true,
88
});

‎src/components/Progress/ProgressPage/index.tsx‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
33

4+
import{pageSet,routeSet}from'../../../actions';
45
importprogressIconfrom'../progressIcon';
56
import{ListItem}from'material-ui/List';
67
import{grey400}from'material-ui/styles/colors';
@@ -34,6 +35,18 @@ class ProgressPage extends React.Component<{
3435
};
3536
};
3637

38+
constmapStateToProps=(state,props)=>({
39+
progress:state.progress,
40+
pagePosition:state.pagePosition,
41+
page:props.page,
42+
index:props.index,
43+
});
3744

45+
constmapDispatchToProps=dispatch=>({
46+
selectPage(pagePosition:CR.PagePosition){
47+
dispatch(pageSet(pagePosition));
48+
dispatch(routeSet('page'));
49+
}
50+
});
3851

39-
exportdefaultProgressPage;
52+
exportdefaultconnect(mapStateToProps,mapDispatchToProps)(ProgressPage);

‎src/components/Progress/index.tsx‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
33

4-
import{pageSet,routeSet,progressLoad}from'../../actions';
4+
import{progressLoad}from'../../actions';
55
importProgressPagefrom'./ProgressPage';
66
import{List}from'material-ui/List';
77
importPaperfrom'material-ui/Paper';
@@ -17,12 +17,10 @@ const styles = {
1717
};
1818

1919
classProgressextendsReact.Component<{
20-
progress:CR.Progress,pagePosition:CR.PagePosition,
2120
info:Tutorial.Info,tutorial:CR.Tutorial,progressLoad:()=>any,
22-
selectPage:(pagePosition:CR.PagePosition)=>any,
2321
},{}>{
2422
publicrender(){
25-
const{progress, pagePosition,info, tutorial, selectPage}=this.props;
23+
const{info, tutorial}=this.props;
2624
return(
2725
<Paperstyle={styles.page}>
2826
<Liststyle={styles.list}>
@@ -32,9 +30,6 @@ class Progress extends React.Component<{
3230
key={index}
3331
index={index}
3432
page={page}
35-
pagePosition={pagePosition}
36-
progress={progress}
37-
selectPage={selectPage}
3833
/>
3934
))
4035
}
@@ -48,18 +43,12 @@ class Progress extends React.Component<{
4843
}
4944

5045
constmapStateToProps=state=>({
51-
progress:state.progress,
52-
pagePosition:state.pagePosition,
5346
info:state.tutorial.info,
5447
tutorial:state.tutorial,
5548
});
5649

57-
constmapDispatchToProps=dispatch=>({
58-
selectPage(pagePosition:CR.PagePosition){
59-
dispatch(pageSet(pagePosition));
60-
dispatch(routeSet('page'));
61-
},
50+
constmapDispatchToProps={
6251
progressLoad
63-
});
52+
};
6453

6554
exportdefaultconnect(mapStateToProps,mapDispatchToProps)(Progress);

‎src/store.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ import reducer from './reducers';
33

44
exportdefaultconfigureStore({
55
reducer,
6-
devMode:false,
6+
devMode:true,
77
});

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp