From 7d12993e1a85e73786626c0769abae19aef23833 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 29 Oct 2015 20:33:04 +0000
Subject: [PATCH] Do not change selected date when going to week or month view.

---
 calendar/js/app.js                  | 1 -
 calendar/js/et2_widget_daycol.js    | 3 +--
 calendar/templates/default/view.xet | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 9d2ca4658e..335d6c6a30 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -2979,7 +2979,6 @@ jQuery.extend(app.classes.calendar,{
 			start_date: function(state) {
 				var d = app.calendar.View.start_date.call(this,state);
 				d.setUTCDate(1);
-				state.date = app.calendar.date.toString(d);
 				return app.calendar.date.start_of_week(d);
 			},
 			end_date: function(state) {
diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js
index ed754914fc..be8670f2e2 100644
--- a/calendar/js/et2_widget_daycol.js
+++ b/calendar/js/et2_widget_daycol.js
@@ -645,8 +645,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
 		// Click on the title
 		if(this.title.is(_ev.target))
 		{
-			this._parent.set_start_date(this.date);
-			this._parent.set_end_date(this.date);
+			app.calendar.update_state({view: 'day',date: this.date.toJSON()});
 			return false;
 		}
 		else if ($j(_ev.target).hasClass('calendar_calAddEvent'))
diff --git a/calendar/templates/default/view.xet b/calendar/templates/default/view.xet
index 192b2e180e..799539057c 100644
--- a/calendar/templates/default/view.xet
+++ b/calendar/templates/default/view.xet
@@ -20,7 +20,7 @@ Egroupware
 			<rows>
 				<row class="view_row">
 					<calendar-timegrid id="${row}" 
-						onchange="var state = {date:widget.options.start_date}; if(widget.options.start_date == widget.options.end_date) state.view = 'day'; app.calendar.update_state(state);"
+						onchange="var state = {}; if(widget.options.start_date == widget.options.end_date) state.view = 'day'; app.calendar.update_state(state);"
 						onevent_change="app.calendar.event_change"
 					>
 					</calendar-timegrid>