extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 21:01:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stop day view resize while hidden - it gets the size wrong.

Browse Source
This commit is contained in:
Nathan Gray 2016-05-03 21:10:20 +00:00
parent e4aa767911
commit 106652b2d2
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
calendar/js/app.js
View File

@ -2201,18 +2201,20 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
{ {
if(state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0 && !egwIsMobile()) if(state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0 && !egwIsMobile())
{ {
if($j(view.etemplates[0].DOMContainer).is(':visible'))
{
view.etemplates[0].widgetContainer.iterateOver(function(w) {
w.set_width($j(view.etemplates[0].DOMContainer).width() * 0.69);
},this,et2_calendar_timegrid);
view.etemplates[0].widgetContainer.iterateOver(function(w) { $j(view.etemplates[1].DOMContainer).css({"left":"69%", "height":($j(framework.tabsUi.activeTab.contentDiv).height()-30)+'px'});
w.set_width($j(view.etemplates[0].DOMContainer).width() * 0.69); // TODO: Maybe some caching here
},this,et2_calendar_timegrid); this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) {
this.getWidgetById('label').set_value(data.label||'');
$j(view.etemplates[1].DOMContainer).css({"left":"69%", "height":($j(framework.tabsUi.activeTab.contentDiv).height()-30)+'px'}); this.getWidgetById('todos').set_value({content:data.todos||''});
// TODO: Maybe some caching here },view.etemplates[1].widgetContainer);
this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) { view.etemplates[0].resize();
this.getWidgetById('label').set_value(data.label||''); }
this.getWidgetById('todos').set_value({content:data.todos||''});
},view.etemplates[1].widgetContainer);
view.etemplates[0].resize();
} }
else else
{ {