extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

for nextmatch/list-view always use default implementation, as user might have changed filters, if no view attribute in state, handle it as listview, for listview only use favorite/name get parameter

Browse Source
This commit is contained in:
Ralf Becker 2013-12-05 00:03:13 +00:00
parent 87936488bf
commit 0290622da1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/js/app.js
View File

@ -498,10 +498,15 @@ app.classes.calendar = AppJS.extend(
*/ */
getState: function() getState: function()
{ {
// we are currently in list-view
if (this.et2 && this.et2.getWidgetById('nm'))
{
return this._super.apply(this, arguments); // call default implementation
}
var egw_script_tag = document.getElementById('egw_script_id'); var egw_script_tag = document.getElementById('egw_script_id');
var state = egw_script_tag.getAttribute('data-calendar-state'); var state = egw_script_tag.getAttribute('data-calendar-state');
return state ? JSON.parse(state) : this._super.apply(this, arguments); return state ? JSON.parse(state) : null;
}, },
/** /**
@ -521,12 +526,12 @@ app.classes.calendar = AppJS.extend(
// old calendar state handling on server-side (incl. switching to and from listview) // old calendar state handling on server-side (incl. switching to and from listview)
var menuaction = 'calendar.calendar_uiviews.index'; var menuaction = 'calendar.calendar_uiviews.index';
if (state.view == 'listview') if (typeof state.view == 'undefined' || state.view == 'listview')
{ {
menuaction = 'calendar.calendar_uilist.index'; menuaction = 'calendar.calendar_uilist.index';
if (state.name) if (state.name)
{ {
state.favorite = state.name.replace(/[^A-Za-z0-9-_]/g, '_'); state = {favorite: state.name.replace(/[^A-Za-z0-9-_]/g, '_')};
} }
} }
for(name in state) for(name in state)