summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien MUETTON <the.mouette@gmail.com>2010-08-31 11:53:56 +0200
committerJulien MUETTON <the.mouette@gmail.com>2010-08-31 11:53:56 +0200
commit15856104404ced7c77f4891bf597919e4381e384 (patch)
treeb5e348bd594191a1ec0e0cbda57c96816939b878
parentd5e19478d2aa24e94669817a1a688b9547d58169 (diff)
parentbf9078efa9e8ac64abcdaf78a6c3a5e8f720cd7e (diff)
downloadjquery-week-calendar-15856104404ced7c77f4891bf597919e4381e384.zip
jquery-week-calendar-15856104404ced7c77f4891bf597919e4381e384.tar.gz
jquery-week-calendar-15856104404ced7c77f4891bf597919e4381e384.tar.bz2
Merge branch 'master' into gh-pages
-rw-r--r--jquery.weekcalendar.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/jquery.weekcalendar.js b/jquery.weekcalendar.js
index 2513dac..81347b3 100644
--- a/jquery.weekcalendar.js
+++ b/jquery.weekcalendar.js
@@ -428,9 +428,10 @@
},
serializeEvents: function(){
+ var self = this;
var calEvents = [];
- $("#calendar").find(".wc-cal-event").each(function(){
+ self.element.find(".wc-cal-event").each(function () {
calEvents.push($(this).data("calEvent"));
});
return calEvents;
@@ -1592,8 +1593,9 @@
$calEvent.draggable({
handle : ".wc-time",
containment: ".wc-scrollable-grid",
- snap: '.wc-day-column-inner',
- snapMode: 'inner',
+ snap: '.wc-day-column-inner',
+ snapMode: 'inner',
+ snapTolerance: options.timeSlotHeight - 1,
revert: 'invalid',
opacity: 0.5,
grid : [$calEvent.outerWidth() + 1, options.timeslotHeight ],