Skip to content
Browse files

fixed issue 740 (event resizing when weekends=false)

  • Loading branch information...
1 parent 09427f2 commit 84ed4065da2bb47f36a7c795cc465f7d1c1b118f @arshaw arshaw committed
Showing with 95 additions and 1 deletion.
  1. +1 −1 src/common/DayEventRenderer.js
  2. +94 −0 tests/issue_740_event_resizing.html
View
2 src/common/DayEventRenderer.js
@@ -392,7 +392,7 @@ function DayEventRenderer() {
c = Math.max(minCell.col, c);
}
}
- dayDelta = (r * colCnt + c*dis+dit) - (origCell.row * colCnt + origCell.col*dis+dit);
+ dayDelta = (r*7 + c*dis+dit) - (origCell.row*7 + origCell.col*dis+dit);
var newEnd = addDays(eventEnd(event), dayDelta, true);
if (dayDelta) {
eventCopy.end = newEnd;
View
94 tests/issue_740_event_resizing.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<script type='text/javascript' src='../src/_loader.js?debug'></script>
+<script type='text/javascript'>
+
+ $(document).ready(function() {
+
+ var date = new Date();
+ var d = date.getDate();
+ var m = date.getMonth();
+ var y = date.getFullYear();
+
+ $('#calendar').fullCalendar({
+ header: {
+ left: 'prev,next today',
+ center: 'title',
+ right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
+ },
+ weekends: false,
+ //firstDay: 1,
+ isRTL: true,
+ editable: true,
+ events: [
+ {
+ title: 'All Day Event',
+ start: new Date(y, m, 1)
+ },
+ {
+ title: 'Long Event',
+ start: new Date(y, m, d-5),
+ end: new Date(y, m, d-2)
+ },
+ {
+ id: 999,
+ title: 'Repeating Event',
+ start: new Date(y, m, d-3, 16, 0),
+ allDay: false
+ },
+ {
+ id: 999,
+ title: 'Repeating Event',
+ start: new Date(y, m, d+4, 16, 0),
+ allDay: false
+ },
+ {
+ title: 'Meeting',
+ start: new Date(y, m, d, 10, 30),
+ allDay: false
+ },
+ {
+ title: 'Lunch',
+ start: new Date(y, m, d, 12, 5),
+ end: new Date(y, m, d, 14, 43),
+ allDay: false
+ },
+ {
+ title: 'Birthday Party',
+ start: new Date(y, m, d+1, 19, 0),
+ end: new Date(y, m, d+1, 22, 30),
+ allDay: false
+ },
+ {
+ title: 'Click for Google',
+ start: new Date(y, m, 28),
+ end: new Date(y, m, 29),
+ url: 'http://google.com/'
+ }
+ ]
+ });
+
+ });
+
+</script>
+<style type='text/css'>
+
+ body {
+ margin-top: 40px;
+ text-align: center;
+ font-size: 13px;
+ font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
+ }
+
+ #calendar {
+ width: 900px;
+ margin: 0 auto;
+ }
+
+</style>
+</head>
+<body>
+<div id='calendar'></div>
+</body>
+</html>

0 comments on commit 84ed406

Please sign in to comment.
Something went wrong with that request. Please try again.