summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-10 14:28:26 +0200
committerSebastian Wagner2011-10-10 14:28:26 +0200
commit6f59d09c5195d91cc181fd81864bc1e370b99466 (patch)
tree4a4f3adc1a3e78636e394d09d96a7dec32298af0
parentsome changes (diff)
downloadpoolctrl-6f59d09c5195d91cc181fd81864bc1e370b99466.tar.gz
poolctrl-6f59d09c5195d91cc181fd81864bc1e370b99466.tar.xz
poolctrl-6f59d09c5195d91cc181fd81864bc1e370b99466.zip
bugfix
-rwxr-xr-xapplication/views/scripts/event/index.phtml10
-rwxr-xr-xpublic/media/js/fullcalendar.js4
2 files changed, 7 insertions, 7 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 3f54769..07b3b37 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -506,7 +506,7 @@ var dayClick = false;
eventDragStop: function(event, jsEvent, ui, view, date) {
//var date = $('#calendar').fullCalendar('getDate');
- alert(date);
+ //alert(date);
/*
if() {
isDroppable = false;
@@ -755,28 +755,28 @@ var dayClick = false;
<!-- delete wdhEvent -->
<div id="eventDeleteWdhDialog" style="display: none">
-<p>This is a Wdh-Event!</p>
+<p>This is a Repeat-Event!</p>
<p>Do you want to delete any event occurring this event or just the
selected one?</p>
</div>
<!-- resize wdhEvent -->
<div id="eventResizeWdhDialog" style="display: none">
-<p>This is a Wdh-Event!</p>
+<p>This is a Repeat-Event!</p>
<p>Do you want to resize any event occurring this event or just the
selected one?</p>
</div>
<!-- move wdhEvent -->
<div id="eventMoveWdhDialog" style="display: none">
-<p>This is a Wdh-Event!</p>
+<p>This is a Repeat-Event!</p>
<p>Do you want to move any event occurring this event or just the
selected one?</p>
</div>
<!-- edit wdhEvent -->
<div id="eventEditWdhDialog" style="display: none">
-<p>This is a Wdh-Event!</p>
+<p>This is a Repeat-Event!</p>
<p>Do you want to edit any event occurring this event or just the
selected one?</p>
</div>
diff --git a/public/media/js/fullcalendar.js b/public/media/js/fullcalendar.js
index cdec492..9cd9115 100755
--- a/public/media/js/fullcalendar.js
+++ b/public/media/js/fullcalendar.js
@@ -4323,9 +4323,9 @@ function AgendaEventRenderer() {
},
stop: function(ev, ui) {
var cell = hoverListener.stop();
- var date = cellDate(cell);
+ //var date = cellDate(cell);
clearOverlays();
- trigger('eventDragStop', eventElement, event, ev, ui, date);
+ trigger('eventDragStop', eventElement, event, ev, ui);
if (cell && (dayDelta || minuteDelta || allDay)) {
// changed!
eventDrop(this, event, dayDelta, allDay ? 0 : minuteDelta, allDay, ev, ui);