Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Commit

Permalink
use es6 module
Browse files Browse the repository at this point in the history
  • Loading branch information
yiminghe committed Jul 7, 2015
1 parent f4205d9 commit 4551d5e
Show file tree
Hide file tree
Showing 30 changed files with 160 additions and 172 deletions.
15 changes: 7 additions & 8 deletions examples/ant-design-picker.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
require('rc-calendar/assets/index.css');
var React = require('react');
var Calendar = require('rc-calendar');
var DatePicker = Calendar.Picker;
var zhCn = require('gregorian-calendar/lib/locale/zh-cn'); // spm error
var DateTimeFormat = require('gregorian-calendar-format');
var GregorianCalendar = require('gregorian-calendar');
var CalendarLocale = require('rc-calendar/src/locale/zh-cn');
import 'rc-calendar/assets/index.css';
import React from 'react';
import Calendar,{Picker as DatePicker} from 'rc-calendar';
import zhCn from 'gregorian-calendar/lib/locale/zh-cn'; // spm error
import DateTimeFormat from 'gregorian-calendar-format';
import GregorianCalendar from 'gregorian-calendar';
import CalendarLocale from 'rc-calendar/src/locale/zh-cn';
var now = new GregorianCalendar(zhCn);
now.setTime(Date.now());

Expand Down
12 changes: 6 additions & 6 deletions examples/ant-design-simple.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

require('rc-calendar/assets/index.css');

var Calendar = require('rc-calendar');
var GregorianCalendarFormat = require('gregorian-calendar-format');
var React = require('react');
import Calendar from 'rc-calendar';
import GregorianCalendarFormat from 'gregorian-calendar-format';
import React from 'react';
var formatter = new GregorianCalendarFormat('yyyy-MM-dd HH:mm:ss');
var GregorianCalendar = require('gregorian-calendar');
var zhCn = require('gregorian-calendar/lib/locale/zh-cn');
var CalendarLocale = require('rc-calendar/src/locale/zh-cn');
import GregorianCalendar from 'gregorian-calendar';
import zhCn from 'gregorian-calendar/lib/locale/zh-cn';
import CalendarLocale from 'rc-calendar/src/locale/zh-cn';

var value = new GregorianCalendar(zhCn);
value.setTime(Date.now());
Expand Down
18 changes: 8 additions & 10 deletions examples/defaultValue.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@

require('bootstrap/dist/css/bootstrap.css');
require('rc-calendar/assets/bootstrap.css');
var React = require('react');
var Calendar = require('rc-calendar');
var DatePicker = Calendar.Picker;
var zhCn = require('gregorian-calendar/lib/locale/zh-cn'); // spm error
var DateTimeFormat = require('gregorian-calendar-format');
var GregorianCalendar = require('gregorian-calendar');
var CalendarLocale = require('rc-calendar/src/locale/zh-cn');
import 'bootstrap/dist/css/bootstrap.css';
import 'rc-calendar/assets/bootstrap.css';
import React from 'react';
import Calendar,{Picker as DatePicker} from 'rc-calendar';
import zhCn from 'gregorian-calendar/lib/locale/zh-cn'; // spm error
import DateTimeFormat from 'gregorian-calendar-format';
import GregorianCalendar from 'gregorian-calendar';
import CalendarLocale from 'rc-calendar/src/locale/zh-cn';

var Test = React.createClass({
open: function () {
Expand Down
8 changes: 4 additions & 4 deletions examples/disabled.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

require('rc-calendar/assets/bootstrap.css');
var Calendar = require('rc-calendar');
var GregorianCalendarFormat = require('gregorian-calendar-format');
var React = require('react');
import 'rc-calendar/assets/bootstrap.css';
import Calendar from 'rc-calendar';
import GregorianCalendarFormat from 'gregorian-calendar-format';
import React from 'react';
var formatter = new GregorianCalendarFormat('yyyy-MM-dd HH:mm:ss');

function onSelect(value) {
Expand Down
17 changes: 8 additions & 9 deletions examples/picker.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@

require('bootstrap/dist/css/bootstrap.css');
require('rc-calendar/assets/bootstrap.css');
var React = require('react');
var Calendar = require('rc-calendar');
var DatePicker = Calendar.Picker;
var zhCn = require('gregorian-calendar/lib/locale/zh-cn'); // spm error
var DateTimeFormat = require('gregorian-calendar-format');
var GregorianCalendar = require('gregorian-calendar');
var CalendarLocale = require('rc-calendar/src/locale/zh-cn');
import 'bootstrap/dist/css/bootstrap.css';
import 'rc-calendar/assets/bootstrap.css';
import React from 'react';
import Calendar, {Picker as DatePicker} from 'rc-calendar';
import zhCn from 'gregorian-calendar/lib/locale/zh-cn'; // spm error
import DateTimeFormat from 'gregorian-calendar-format';
import GregorianCalendar from 'gregorian-calendar';
import CalendarLocale from 'rc-calendar/src/locale/zh-cn';

var Test = React.createClass({
toggle: function () {
Expand Down
15 changes: 7 additions & 8 deletions examples/renderCalendarToBody.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
require('rc-calendar/assets/index.css');
var React = require('react');
var Calendar = require('rc-calendar');
var DatePicker = Calendar.Picker;
var zhCn = require('gregorian-calendar/lib/locale/zh-cn');
var DateTimeFormat = require('gregorian-calendar-format');
var GregorianCalendar = require('gregorian-calendar');
var CalendarLocale = require('rc-calendar/src/locale/zh-cn');
import 'rc-calendar/assets/index.css';
import React from 'react';
import Calendar, {Picker as DatePicker} from 'rc-calendar';
import zhCn from 'gregorian-calendar/lib/locale/zh-cn';
import DateTimeFormat from 'gregorian-calendar-format';
import GregorianCalendar from 'gregorian-calendar';
import CalendarLocale from 'rc-calendar/src/locale/zh-cn';
var value = new GregorianCalendar(zhCn);
value.setTime(Date.now());

Expand Down
9 changes: 4 additions & 5 deletions examples/simple.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

require('rc-calendar/assets/bootstrap.css');

var Calendar = require('rc-calendar');
var GregorianCalendarFormat = require('gregorian-calendar-format');
var React = require('react');
import 'rc-calendar/assets/bootstrap.css';
import Calendar from 'rc-calendar';
import GregorianCalendarFormat from 'gregorian-calendar-format';
import React from 'react';
var formatter = new GregorianCalendarFormat('yyyy-MM-dd HH:mm:ss');

function onSelect(value) {
Expand Down
9 changes: 4 additions & 5 deletions examples/theme.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

require('rc-calendar/assets/classic.css');
var Calendar = require('rc-calendar');
var GregorianCalendarFormat = require('gregorian-calendar-format');
var React = require('react');
import 'rc-calendar/assets/classic.css';
import Calendar from 'rc-calendar';
import GregorianCalendarFormat from 'gregorian-calendar-format';
import React from 'react';
var formatter = new GregorianCalendarFormat('yyyy-MM-dd HH:mm:ss');

function onSelect(value) {
Expand Down
3 changes: 2 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
module.exports = require('./src/');
import Calendar from './src/';
export default Calendar;
23 changes: 11 additions & 12 deletions src/Calendar.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
'use strict';

var React = require('react');
var DateTimeFormat = require('gregorian-calendar-format');
var GregorianCalendar = require('gregorian-calendar');
var rcUtil = require('rc-util');
var KeyCode = rcUtil.KeyCode;
var DateTable = require('./date/DateTable');
var CalendarHeader = require('./calendar/CalendarHeader');
var CalendarFooter = require('./calendar/CalendarFooter');
var staticPrefixClsFn = require('./util/prefixClsFn');
import React from 'react';
import DateTimeFormat from 'gregorian-calendar-format';
import GregorianCalendar from 'gregorian-calendar';
import rcUtil, {KeyCode} from 'rc-util';
import DateTable from './date/DateTable';
import CalendarHeader from './calendar/CalendarHeader';
import CalendarFooter from './calendar/CalendarFooter';
import staticPrefixClsFn from './util/prefixClsFn';
import enUs from './locale/en-us';

function noop() {
}
Expand Down Expand Up @@ -62,6 +62,7 @@ function getNowByCurrentStateValue(value) {
return value;
}

export default
class Calendar extends React.Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -294,7 +295,7 @@ Calendar.propTypes = {
};

Calendar.defaultProps = {
locale: require('./locale/en-us'),
locale: enUs,
style: {},
prefixCls: 'rc-calendar',
onKeyDown: noop,
Expand All @@ -306,5 +307,3 @@ Calendar.defaultProps = {
onClear: noop,
onOk: noop
};

module.exports = Calendar;
23 changes: 10 additions & 13 deletions src/Picker.jsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
'use strict';

var React = require('react');
var DateTimeFormat = require('gregorian-calendar-format');
var rcUtil = require('rc-util');
import React from 'react';
import DateTimeFormat from 'gregorian-calendar-format';
import rcUtil, {createChainedFunction, KeyCode} from 'rc-util';
var toFragment = rcUtil.Children.mapSelf;
var KeyCode = rcUtil.KeyCode;
var domAlign = require('dom-align');
import domAlign from 'dom-align';
var orientMap = {
tl: ['top', 'left'],
tr: ['top', 'right'],
bl: ['bottom', 'left'],
br: ['bottom', 'right']
};
var createChainedFunction = rcUtil.createChainedFunction;
var cssAnimate = require('css-animation');
import cssAnimate from 'css-animation';

function getImmutableOrient(orient) {
if (orient) {
Expand All @@ -26,6 +24,10 @@ function getImmutableOrient(orient) {
}
}

function prevent(e) {
e.preventDefault();
}

function refFn(field, component) {
this[field] = component;
}
Expand All @@ -40,6 +42,7 @@ function getContainerClassName(prefixCls, open) {
/**
* DatePicker = wrap input using Calendar
*/
export default
class Picker extends React.Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -321,10 +324,6 @@ class Picker extends React.Component {
}
}

function prevent(e) {
e.preventDefault();
}

Picker.propTypes = {
onChange: React.PropTypes.func,
renderCalendarToBody: React.PropTypes.bool,
Expand All @@ -339,5 +338,3 @@ Picker.defaultProps = {
},
formatter: new DateTimeFormat('yyyy-MM-dd')
};

module.exports = Picker;
10 changes: 5 additions & 5 deletions src/calendar/CalendarFooter.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
'use strict';

var React = require('react');
var Time = require('../time/Time');
var toFragment = require('rc-util').Children.mapSelf;
import React from 'react';
import Time from '../time/Time';
import rcUtil from 'rc-util';
var toFragment = rcUtil.Children.mapSelf;

export default
class CalendarFooter extends React.Component {
getTodayTime() {
var value = this.props.value;
Expand Down Expand Up @@ -60,5 +62,3 @@ class CalendarFooter extends React.Component {
return footerEl;
}
}

module.exports = CalendarFooter;
15 changes: 8 additions & 7 deletions src/calendar/CalendarHeader.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
'use strict';

var React = require('react');
var MonthPanel = require('../month/MonthPanel');
var DateTimeFormat = require('gregorian-calendar-format');
var YearPanel = require('../year/YearPanel');
var toFragment = require('rc-util').Children.mapSelf;

import React from 'react';
import MonthPanel from '../month/MonthPanel';
import DateTimeFormat from 'gregorian-calendar-format';
import YearPanel from '../year/YearPanel';
import rcUtil from 'rc-util';
var toFragment = rcUtil.Children.mapSelf;

export default
class CalendarHeader extends React.Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -112,5 +115,3 @@ class CalendarHeader extends React.Component {
</div>;
}
}

module.exports = CalendarHeader;
2 changes: 1 addition & 1 deletion src/date/DateConstants.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

module.exports = {
export default {
DATE_ROW_COUNT: 6,
DATE_COL_COUNT: 7
};
7 changes: 3 additions & 4 deletions src/date/DateTBody.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var React = require('react');
var DateConstants = require('./DateConstants');
import React from 'react';
import DateConstants from './DateConstants';

function isSameDay(one, two) {
return one.getYear() === two.getYear() &&
Expand Down Expand Up @@ -38,6 +38,7 @@ function handleDayClick(current) {
this.props.onSelect(current);
}

export default
class DateTBody extends React.Component {
render() {
var props = this.props;
Expand Down Expand Up @@ -166,5 +167,3 @@ class DateTBody extends React.Component {
</tbody>);
}
}

module.exports = DateTBody;
7 changes: 3 additions & 4 deletions src/date/DateTHead.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
'use strict';

var React = require('react');
var DateConstants = require('./DateConstants');
import React from 'react';
import DateConstants from './DateConstants';

export default
class DateTHead extends React.Component {
render() {
var props = this.props;
Expand Down Expand Up @@ -42,5 +43,3 @@ class DateTHead extends React.Component {
</thead>;
}
}

module.exports = DateTHead;
9 changes: 4 additions & 5 deletions src/date/DateTable.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use strict';

var React = require('react');
var DateTHead = require('./DateTHead');
var DateTBody = require('./DateTBody');
import React from 'react';
import DateTHead from './DateTHead';
import DateTBody from './DateTBody';

export default
class DateTable extends React.Component {
render() {
var props = this.props;
Expand All @@ -14,5 +15,3 @@ class DateTable extends React.Component {
</table>);
}
}

module.exports = DateTable;
10 changes: 5 additions & 5 deletions src/decade/DecadePanel.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
'use strict';

var React = require('react');
import React from 'react';
var ROW = 4;
var COL = 3;
var cx = require('rc-util').classSet;
var staticPrefixClsFn = require('../util/prefixClsFn');
import rcUtil from 'rc-util';
var cx = rcUtil.classSet;
import staticPrefixClsFn from '../util/prefixClsFn';

function goYear(direction) {
var next = this.state.value.clone();
Expand All @@ -21,6 +22,7 @@ function chooseDecade(year, e) {
e.preventDefault();
}

export default
class DecadePanel extends React.Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -129,5 +131,3 @@ DecadePanel.defaultProps = {
onSelect() {
}
};

module.exports = DecadePanel;
Loading

0 comments on commit 4551d5e

Please sign in to comment.