summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/views/scripts/event/index.phtml44
1 files changed, 26 insertions, 18 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 8b3c0ca..c7358a4 100644
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -13,6 +13,7 @@ $(document).ready(function() {iniCalendar();});
var eventColor = {ev:null, color:null};
var selectedEvent = null; // keydown variable
+var clickTmp = true;
// change border color of an event
@@ -28,6 +29,7 @@ var selectedEvent = null; // keydown variable
eventColor.color = event.borderColor;
event.borderColor = 'black';
$('#calendar').fullCalendar("rerenderEvents");
+ $('#calendar').unbind('eventClick');
}
// change view to addEvent
@@ -161,24 +163,22 @@ var selectedEvent = null; // keydown variable
},
/*
- * TO DO: implement dblclick-function
+ * no use for this because element.bind('dblclick') in eventRender Function
*
- dblclick: function( event, jsEvent, view ) {
- alert('test');
- },
- */
-
- eventClick: function( event, jsEvent, view ) {
-
- /*
- * TO DO: export eventEdit in dblClick function
- *
- *event.dblclick(alert('test'););
- *$('#calendar').dblclick(function() { self.location = "/event/edit/eventID/" + event.id;});
- */
-
- eventSelected(event);
-
+ eventDblclick: function( event, jsEvent, view ) {
+ self.location = "/event/edit/eventID/" + event.id;
+
+ },*/
+
+ eventClick: function( event, jsEvent, view ) {
+
+ if(clickTmp) {
+ clickTmp = false;
+ setTimeout(function() {clickTmp = true} , 300);
+ eventSelected(event);
+ } else {
+ self.location = "/event/edit/eventID/" + event.id;
+ }
},
select: function( startDate, endDate, allDay, jsEvent, view ) {
@@ -350,6 +350,14 @@ var selectedEvent = null; // keydown variable
},
eventRender: function(event, element, view) {
+
+ /*
+ * no need for this
+ *
+ element.bind('dblclick', function(){
+ self.location = "/event/edit/eventID/" + event.id;
+ })
+ */
/*
* TO DO: Eventhandler löschen bei eventClick, da sich sonst das qtip bindet
@@ -363,7 +371,7 @@ var selectedEvent = null; // keydown variable
show: 'mouseover',
hide: 'mouseout'
});
- */
+ */
if (view.name == 'agendaWeek') {