summaryrefslogtreecommitdiffstats
path: root/application/views/scripts/event/index.phtml
diff options
context:
space:
mode:
authorSebastian Wagner2011-09-10 11:44:51 +0200
committerSebastian Wagner2011-09-10 11:44:51 +0200
commitbf52b6b3640f89d570f2b73693718d98d6efebe8 (patch)
tree236098921688223588bea081d73fe306630758bc /application/views/scripts/event/index.phtml
parentminor (diff)
downloadpoolctrl-bf52b6b3640f89d570f2b73693718d98d6efebe8.tar.gz
poolctrl-bf52b6b3640f89d570f2b73693718d98d6efebe8.tar.xz
poolctrl-bf52b6b3640f89d570f2b73693718d98d6efebe8.zip
fix
Diffstat (limited to 'application/views/scripts/event/index.phtml')
-rw-r--r--application/views/scripts/event/index.phtml8
1 files changed, 1 insertions, 7 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index b13f035..cea191e 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -161,12 +161,7 @@ var selectedEvent = null; // keydown variable
*/
eventSelected(event);
-<<<<<<< HEAD
-
- pressKey(event);
-=======
->>>>>>> d6293f80fbeb34f466663bd011e29827123255c1
-
+
},
select: function( startDate, endDate, allDay, jsEvent, view ) {
@@ -176,7 +171,6 @@ var selectedEvent = null; // keydown variable
}else {
self.location="/event/add/evstart/" + startDate + "/evend/" + endDate;
}
-
},
eventResize: function( event, dayDelta, minuteDelta, revertFunc ) {