svn commit: r1484139 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar: CalendarPanel.java calendar-functions.js

[solomax]

Author: solomax
Date: Sat May 18 16:27:15 2013
New Revision: 1484139

URL: http://svn.apache.org/r1484139
Log:
[OPENMEETINGS-630] window resize seems to work as expected

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1484139&r1=1484138&r2=1484139&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
 Sat May 18 16:27:15 2013
@@ -61,12 +61,12 @@ public class CalendarPanel extends UserP
                add(dialog);
                
                Options options = new Options();
-               //options.set("theme", true);
                options.set("header", "{left: 'prevYear,prev,next,nextYear 
today', center: 'title', right: 'month,agendaWeek,agendaDay'}");
                options.set("allDaySlot", false);
                options.set("axisFormat", "'HH(:mm)'");
                options.set("defaultEventMinutes", 60);
                options.set("timeFormat", "{agenda: 'HH:mm{ - HH:mm}', '': 
'HH(:mm)'}");
+               options.set("windowResize", 
"function(view){setCalendarHeight();}");
                
                calendar = new Calendar("calendar", new AppointmentModel(), 
options) {
                        private static final long serialVersionUID = 
8442068089963449950L;

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js?rev=1484139&r1=1484138&r2=1484139&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/calendar-functions.js
 Sat May 18 16:27:15 2013
@@ -28,6 +28,5 @@ function setCalendarHeight() {
 }
 
 $(function() {
-    //$(window).on('resize', setCalendarHeight);
     $(window).load(function() { setCalendarHeight(); } );
 });