mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-10-05 17:52:03 +02:00
Keep a single day/week on one page
This commit is contained in:
parent
40cff39e5a
commit
20a191464b
@ -1886,6 +1886,14 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var height_check = this.div.height();
|
||||||
|
this.div.css('max-height','17cm');
|
||||||
|
if(this.div.height() != height_check)
|
||||||
|
{
|
||||||
|
this.div.height('17cm');
|
||||||
|
this._resizeTimes();
|
||||||
|
}
|
||||||
|
|
||||||
// update day widgets
|
// update day widgets
|
||||||
var day_width = (100 / this.day_widgets.length);
|
var day_width = (100 / this.day_widgets.length);
|
||||||
for(var i = 0; i < this.day_widgets.length; i++)
|
for(var i = 0; i < this.day_widgets.length; i++)
|
||||||
@ -1911,7 +1919,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
|
|||||||
'transform': 'translateY(-'+this.scrolling.scrollTop()+'px)',
|
'transform': 'translateY(-'+this.scrolling.scrollTop()+'px)',
|
||||||
'height': height+'px'
|
'height': height+'px'
|
||||||
});
|
});
|
||||||
this.div.css('height','');
|
this.div.css({'height':'','max-height':''});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -1921,9 +1929,9 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
|
|||||||
afterPrint: function() {
|
afterPrint: function() {
|
||||||
this.div.css('maxHeight','');
|
this.div.css('maxHeight','');
|
||||||
this.scrolling.children().css({'transform':'', 'overflow':''});
|
this.scrolling.children().css({'transform':'', 'overflow':''});
|
||||||
|
this.div.height(this.options.height);
|
||||||
if (navigator.userAgent.match(/(firefox|safari|iceweasel)/i) && !navigator.userAgent.match(/chrome/i))
|
if (navigator.userAgent.match(/(firefox|safari|iceweasel)/i) && !navigator.userAgent.match(/chrome/i))
|
||||||
{
|
{
|
||||||
this.div.height(this.options.height);
|
|
||||||
this._resizeTimes();
|
this._resizeTimes();
|
||||||
this.scrolling
|
this.scrolling
|
||||||
// Re-enable out-of-view formatting on scroll
|
// Re-enable out-of-view formatting on scroll
|
||||||
|
Loading…
Reference in New Issue
Block a user