Skip to content

Commit 0351b71

Browse files
committed
[fixed] incorrect 'show more' layout
1 parent 283f3a4 commit 0351b71

File tree

3 files changed

+31
-19
lines changed

3 files changed

+31
-19
lines changed

examples/events.js

+29-14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
// import Chance from 'chance';
2+
3+
// let chance = new Chance();
4+
// let events = []
5+
6+
// for (var i = 0; i < 300; i++) {
7+
// events.push({
8+
// start: chance.date({ year: 2015 }),
9+
// })
10+
111
export default [
212
{
313
"title": "All Day Event",
@@ -23,31 +33,36 @@ export default [
2333
{
2434
"title": "Meeting",
2535
"start": new Date(2015, 3, 12, 10, 30, 0, 0),
26-
"end": new Date(2015, 3, 12, 12, 30, 0, 0)
36+
"end": new Date(2015, 3, 13, 12, 30, 0, 0)
2737
},
2838
{
2939
"title": "Lunch",
3040
"start":new Date(2015, 3, 12, 12, 0, 0, 0),
31-
"end": new Date(2015, 3, 12, 13, 0, 0, 0)
41+
"end": new Date(2015, 3, 13, 13, 0, 0, 0)
3242
},
3343
{
3444
"title": "Meeting",
3545
"start":new Date(2015, 3, 12,14, 0, 0, 0),
36-
"end": new Date(2015, 3, 12,15, 0, 0, 0)
46+
"end": new Date(2015, 3, 13,15, 0, 0, 0)
3747
},
3848
{
3949
"title": "Happy Hour",
4050
"start":new Date(2015, 3, 12, 17, 0, 0, 0),
41-
"end": new Date(2015, 3, 12, 17, 30, 0, 0)
51+
"end": new Date(2015, 3, 13, 17, 30, 0, 0)
4252
},
43-
{
44-
"title": "Dinner",
45-
"start":new Date(2015, 3, 12, 20, 0, 0, 0),
46-
"end": new Date(2015, 3, 12, 21, 0, 0, 0)
47-
},
48-
{
49-
"title": "Birthday Party",
50-
"start":new Date(2015, 3, 13, 7, 0, 0),
51-
"end": new Date(2015, 3, 13, 10, 30, 0)
52-
}
53+
// {
54+
// "title": "Dinner",
55+
// "start":new Date(2015, 3, 12, 20, 0, 0, 0),
56+
// "end": new Date(2015, 3, 13, 21, 0, 0, 0)
57+
// },
58+
// {
59+
// "title": "Birthday Party",
60+
// "start":new Date(2015, 3, 13, 7, 0, 0),
61+
// "end": new Date(2015, 3, 13, 10, 30, 0)
62+
// },
63+
// {
64+
// "title": "Birthday Party 2",
65+
// "start":new Date(2015, 3, 13, 7, 0, 0),
66+
// "end": new Date(2015, 3, 13, 7, 0, 0)
67+
// }
5368
]

package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"full calendar"
2222
],
2323
"scripts": {
24-
"prepublish": "npm run test && npm run build",
2524
"clean": "rimraf lib",
2625
"clean:examples": "rimraf examples/static",
2726
"less": "lessc -x src/less/styles.less ./lib/css/react-big-calendar.css",
@@ -33,9 +32,7 @@
3332
"test": "npm run lint && karma start --single-run",
3433
"tdd": "karma start",
3534
"coverage": "COVERAGE=true karma start --single-run",
36-
"patch": "release patch",
37-
"minor": "release minor",
38-
"major": "release major"
35+
"release": "release"
3936
},
4037
"peerDependencies": {
4138
"react": "^0.14.0-beta1",

src/EventEndingRow.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ let EventRow = React.createClass({
5656
row.push(this.renderSpan(gap, key + '_gap'))
5757

5858
row.push(this.renderSpan(1, key, this.renderShowMore(segments, current)))
59-
current++;
59+
lastEnd = current = current + 1
6060
}
6161
}
6262

0 commit comments

Comments
 (0)