My favorites | Sign in
Project Home Issues
New issue   Search
for
  Advanced search   Search tips   Subscriptions

Issue 776 attachment: fullcalendar.js.patch (5.2 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
*** /Users/rbohn/Desktop/fullcalendar-1.4.9/fullcalendar/fullcalendar.js 2010-11-19 22:45:58.000000000 -0500
--- /Users/rbohn/projects/versatile/zeus-psu-nanofab/b_princeton/src/main/webapp/js/nanofab/fullcalendarold.js 2010-12-30 12:08:24.000000000 -0500
***************
*** 2991,2996 ****
--- 2991,3005 ----
var colWidth = getColWidth();
var slotHeight = getSlotHeight();
var minMinute = getMinMinute();
+ var dragMinutes = opt('dragMinutes');
+ var slotMinutes = opt('slotMinutes');
+
+ if (dragMinutes) {
+ var diff = (dragMinutes / slotMinutes);
+ slotHeight = slotHeight * diff;
+ slotMinutes = slotMinutes *diff;
+ }
+
eventElement.draggable({
zIndex: 9,
opacity: opt('dragOpacity', 'month'), // use whatever the month view was using
***************
*** 3019,3025 ****
eventElement.width(colWidth - 10), // don't use entire width
slotHeight * Math.round(
(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes'))
! / opt('slotMinutes')
)
);
eventElement.draggable('option', 'grid', [colWidth, 1]);
--- 3028,3034 ----
eventElement.width(colWidth - 10), // don't use entire width
slotHeight * Math.round(
(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes'))
! / slotMinutes
)
);
eventElement.draggable('option', 'grid', [colWidth, 1]);
***************
*** 3039,3045 ****
var minuteDelta = 0;
if (!allDay) {
minuteDelta = Math.round((eventElement.offset().top - getBodyContent().offset().top) / slotHeight)
! * opt('slotMinutes')
+ minMinute
- (event.start.getHours() * 60 + event.start.getMinutes());
}
--- 3048,3054 ----
var minuteDelta = 0;
if (!allDay) {
minuteDelta = Math.round((eventElement.offset().top - getBodyContent().offset().top) / slotHeight)
! * slotMinutes
+ minMinute
- (event.start.getHours() * 60 + event.start.getMinutes());
}
***************
*** 3081,3086 ****
--- 3090,3104 ----
var colCnt = getColCnt();
var colWidth = getColWidth();
var slotHeight = getSlotHeight();
+ var dragMinutes = opt('dragMinutes');
+ var slotMinutes = opt('slotMinutes');
+
+ if (dragMinutes) {
+ var diff = (dragMinutes / slotMinutes);
+ slotHeight = slotHeight * diff;
+ slotMinutes = slotMinutes *diff;
+ }
+
eventElement.draggable({
zIndex: 9,
scroll: false,
***************
*** 3121,3127 ****
}, ev, 'drag');
},
drag: function(ev, ui) {
! minuteDelta = Math.round((ui.position.top - origPosition.top) / slotHeight) * opt('slotMinutes');
if (minuteDelta != prevMinuteDelta) {
if (!allDay) {
updateTimeText(minuteDelta);
--- 3139,3145 ----
}, ev, 'drag');
},
drag: function(ev, ui) {
! minuteDelta = Math.round((ui.position.top - origPosition.top) / slotHeight) * slotMinutes;
if (minuteDelta != prevMinuteDelta) {
if (!allDay) {
updateTimeText(minuteDelta);
***************
*** 3180,3185 ****
--- 3198,3212 ----
if (!opt('disableResizing') && eventElement.resizable) {
var slotDelta, prevSlotDelta;
var slotHeight = getSlotHeight();
+ var slotMinutes = opt('slotMinutes');
+
+ var resizeMinutes = opt('resizeMinutes');
+
+ if (resizeMinutes) {
+ var diff = (resizeMinutes / slotMinutes);
+ slotHeight = slotHeight * diff;
+ slotMinutes = slotMinutes *diff;
+ }
eventElement.resizable({
handles: {
s: 'div.ui-resizable-s'
***************
*** 3202,3208 ****
formatDates(
event.start,
(!slotDelta && !event.end) ? null : // no change, so don't display time range
! addMinutes(eventEnd(event), opt('slotMinutes')*slotDelta),
opt('timeFormat')
)
);
--- 3229,3235 ----
formatDates(
event.start,
(!slotDelta && !event.end) ? null : // no change, so don't display time range
! addMinutes(eventEnd(event), slotMinutes*slotDelta),
opt('timeFormat')
)
);
***************
*** 3212,3218 ****
stop: function(ev, ui) {
trigger('eventResizeStop', this, event, ev, ui);
if (slotDelta) {
! eventResize(this, event, 0, opt('slotMinutes')*slotDelta, ev, ui);
}else{
eventElement.css('z-index', 8);
showEvents(event, eventElement);
--- 3239,3245 ----
stop: function(ev, ui) {
trigger('eventResizeStop', this, event, ev, ui);
if (slotDelta) {
! eventResize(this, event, 0, slotMinutes*slotDelta, ev, ui);
}else{
eventElement.css('z-index', 8);
showEvents(event, eventElement);
***************
*** 4805,4809 ****
*/


!
})(jQuery);
\ No newline at end of file
--- 4832,4836 ----
*/


!
})(jQuery);
\ No newline at end of file
Powered by Google Project Hosting