Skip to content
This repository has been archived by the owner on Aug 1, 2024. It is now read-only.

Commit

Permalink
[fixed] incorrect 'show more' layout
Browse files Browse the repository at this point in the history
  • Loading branch information
jquense committed Oct 28, 2015
1 parent 283f3a4 commit 0351b71
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 19 deletions.
43 changes: 29 additions & 14 deletions examples/events.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
// import Chance from 'chance';

// let chance = new Chance();
// let events = []

// for (var i = 0; i < 300; i++) {
// events.push({
// start: chance.date({ year: 2015 }),
// })

export default [
{
"title": "All Day Event",
Expand All @@ -23,31 +33,36 @@ export default [
{
"title": "Meeting",
"start": new Date(2015, 3, 12, 10, 30, 0, 0),
"end": new Date(2015, 3, 12, 12, 30, 0, 0)
"end": new Date(2015, 3, 13, 12, 30, 0, 0)
},
{
"title": "Lunch",
"start":new Date(2015, 3, 12, 12, 0, 0, 0),
"end": new Date(2015, 3, 12, 13, 0, 0, 0)
"end": new Date(2015, 3, 13, 13, 0, 0, 0)
},
{
"title": "Meeting",
"start":new Date(2015, 3, 12,14, 0, 0, 0),
"end": new Date(2015, 3, 12,15, 0, 0, 0)
"end": new Date(2015, 3, 13,15, 0, 0, 0)
},
{
"title": "Happy Hour",
"start":new Date(2015, 3, 12, 17, 0, 0, 0),
"end": new Date(2015, 3, 12, 17, 30, 0, 0)
"end": new Date(2015, 3, 13, 17, 30, 0, 0)
},
{
"title": "Dinner",
"start":new Date(2015, 3, 12, 20, 0, 0, 0),
"end": new Date(2015, 3, 12, 21, 0, 0, 0)
},
{
"title": "Birthday Party",
"start":new Date(2015, 3, 13, 7, 0, 0),
"end": new Date(2015, 3, 13, 10, 30, 0)
}
// {
// "title": "Dinner",
// "start":new Date(2015, 3, 12, 20, 0, 0, 0),
// "end": new Date(2015, 3, 13, 21, 0, 0, 0)
// },
// {
// "title": "Birthday Party",
// "start":new Date(2015, 3, 13, 7, 0, 0),
// "end": new Date(2015, 3, 13, 10, 30, 0)
// },
// {
// "title": "Birthday Party 2",
// "start":new Date(2015, 3, 13, 7, 0, 0),
// "end": new Date(2015, 3, 13, 7, 0, 0)
// }
]
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"full calendar"
],
"scripts": {
"prepublish": "npm run test && npm run build",
"clean": "rimraf lib",
"clean:examples": "rimraf examples/static",
"less": "lessc -x src/less/styles.less ./lib/css/react-big-calendar.css",
Expand All @@ -33,9 +32,7 @@
"test": "npm run lint && karma start --single-run",
"tdd": "karma start",
"coverage": "COVERAGE=true karma start --single-run",
"patch": "release patch",
"minor": "release minor",
"major": "release major"
"release": "release"
},
"peerDependencies": {
"react": "^0.14.0-beta1",
Expand Down
2 changes: 1 addition & 1 deletion src/EventEndingRow.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ let EventRow = React.createClass({
row.push(this.renderSpan(gap, key + '_gap'))

row.push(this.renderSpan(1, key, this.renderShowMore(segments, current)))
current++;
lastEnd = current = current + 1
}
}

Expand Down

0 comments on commit 0351b71

Please sign in to comment.