extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 09:28:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Another attempt, preventing events from resizing incorrectly
This commit is contained in:
Nathan Gray 2016-05-04 16:45:42 +00:00
parent 56595a648c
commit b408d9fa1d
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
calendar/js/app.js
View File

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

4
calendar/js/et2_widget_daycol.js
View File

@ -857,10 +857,6 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
*/ */
position_event: function(event) position_event: function(event)
{ {
// Not visible? Skip it for speed.
// Should be called again as part of resize when shown.
if(!this.div.is(':visible')) return;
// Sort events into minimally-overlapping columns // Sort events into minimally-overlapping columns
var columns = this._spread_events(); var columns = this._spread_events();