Skip to content

Commit 8018bb7

Browse files
committed
Moving the localization configuration out of a "render" method, since it's not responsability of the view layer
1 parent d52d993 commit 8018bb7

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

demo/Client.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,24 @@ import {Provider} from 'react-redux';
66
import {syncHistoryWithStore} from 'react-router-redux';
77
import {browserHistory} from 'react-router'
88
import {render} from 'react-dom';
9+
import moment from 'moment';
10+
import numbro from 'numbro';
11+
import reactWidgetsMomentLocalizer from 'react-widgets/lib/localizers/moment';
12+
import momentLocalizer from 'redux-autoform-utils/lib/localization/momentLocalizer';
13+
import numbroLocalizer from 'redux-autoform-utils/lib/localization/numbroLocalizer';
14+
915
import './less/styles.less';
1016

1117
const store = configureStore();
1218
const history = syncHistoryWithStore(browserHistory, store);
1319

20+
// setting date localizer
21+
reactWidgetsMomentLocalizer(moment);
22+
momentLocalizer(moment);
23+
24+
// setting number localizer
25+
numbroLocalizer(numbro);
26+
1427
render(
1528
<Provider store={store}>
1629
<Router history={history} routes={routes}/>

demo/components/LiveSchemaEditor.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ import psjon from '../../package.json';
66
import { AutoForm } from 'redux-autoform';
77
import { EditComponentFactory, DetailsComponentFactory } from '../../src/index';
88
import { Alert, Badge } from 'react-bootstrap';
9-
import moment from 'moment';
10-
import numbro from 'numbro';
11-
import reactWidgetsMomentLocalizer from 'react-widgets/lib/localizers/moment';
12-
import momentLocalizer from 'redux-autoform-utils/lib/localization/momentLocalizer';
13-
import numbroLocalizer from 'redux-autoform-utils/lib/localization/numbroLocalizer';
149
import ButtonToolbar from './ButtonToolbar';
1510
import FormOptions from './FormOptions';
1611

@@ -116,18 +111,8 @@ class LiveSchemaEditor extends Component {
116111
return _.find(presets, p => p.name == preset);
117112
};
118113

119-
setLocalizers = () => {
120-
// setting date localizer
121-
reactWidgetsMomentLocalizer(moment);
122-
momentLocalizer(moment);
123-
124-
// setting number localizer
125-
numbroLocalizer(numbro);
126-
};
127-
128114
render() {
129115
let { reduxFormActions, preset, metaForm, formOptions, formOptionsActions } = this.props;
130-
this.setLocalizers();
131116

132117
return (
133118
<div className="live-schema-editor">

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
"npm": "^3.3.4",
6464
"numbro": "^1.9.1",
6565
"path": "^0.12.7",
66-
"phantomjs": "^2.1.7",
66+
"phantomjs-prebuilt": "^2.1.7",
6767
"raw-loader": "^0.5.1",
6868
"react-ace": "^3.4.1",
6969
"react-hot-loader": "^1.3.0",
7070
"react-router": "^2.0.0",
7171
"react-router-redux": "^4.0.2",
72-
"redux-autoform": "^0.8.0",
72+
"redux-autoform": "^0.8.1",
7373
"redux-devtools": "^3.2.0",
7474
"redux-devtools-dock-monitor": "^1.1.1",
7575
"redux-devtools-log-monitor": "^1.0.9",

0 commit comments

Comments
 (0)