[eGroupWare-svn] r55778 - /trunk/calendar/js/et2_widget_timegrid.js

Author: nathangray
Date: Wed Apr 20 00:57:23 2016
New Revision: 55778

URL: http://svn.stylite.de/viewvc/egroupware?rev=55778&view=rev
Log:
Keep a single day/week on one page

Modified:
    trunk/calendar/js/et2_widget_timegrid.js

Modified: trunk/calendar/js/et2_widget_timegrid.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_timegrid.js?rev=55778&r1=55777&r2=55778&view=diff
==============================================================================
--- trunk/calendar/js/et2_widget_timegrid.js (original)
+++ trunk/calendar/js/et2_widget_timegrid.js Wed Apr 20 00:57:23 2016
@@ -1886,6 +1886,14 @@
 			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
 		var day_width = (100 / this.day_widgets.length);
 		for(var i = 0; i < this.day_widgets.length; i++)
@@ -1911,7 +1919,7 @@
 					'transform': 'translateY(-'+this.scrolling.scrollTop()+'px)',
 					'height': height+'px'
 			});
-			this.div.css('height','');
+			this.div.css({'height':'','max-height':''});
 		}
 	},
 
@@ -1921,9 +1929,9 @@
 	afterPrint: function() {
 		this.div.css('maxHeight','');
 		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))
 		{
-			this.div.height(this.options.height);
 			this._resizeTimes();
 			this.scrolling
 				// Re-enable out-of-view formatting on scroll


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z