diff --git a/examples/events.js b/examples/events.js index 105476105..5631e6c96 100644 --- a/examples/events.js +++ b/examples/events.js @@ -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", @@ -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) + // } ] diff --git a/package.json b/package.json index 90792c60a..bdfcf69a7 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", diff --git a/src/EventEndingRow.jsx b/src/EventEndingRow.jsx index 91e1f7262..040809ead 100644 --- a/src/EventEndingRow.jsx +++ b/src/EventEndingRow.jsx @@ -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 } }