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

[solomax]

Author: solomax
Date: Sun Aug  4 04:26:26 2013
New Revision: 1510096

URL: http://svn.apache.org/r1510096
Log:
[OPENMEETINGS-736] Calendar id is fixed to resolve changing id issues, calendar 
resize if bounded with window.resize

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
    
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.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.html?rev=1510096&r1=1510095&r2=1510096&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
 Sun Aug  4 04:26:26 2013
@@ -22,7 +22,7 @@
        <wicket:panel>
                <div id="wrapper-panel-frame" class="ui-corner-all">
                        <form wicket:id="form">
-                               <div wicket:id="calendar"></div>
+                               <div id="calendar" wicket:id="calendar"></div>
                                <br/>
                                <!-- div wicket:id="feedback"></div -->
                        </form>

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=1510096&r1=1510095&r2=1510096&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
 Sun Aug  4 04:26:26 2013
@@ -105,7 +105,6 @@ public class CalendarPanel extends UserP
                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();}");
 
                options.set("buttonText", "{month: '" + 
WebSession.getString(801) +
                                                                "', week: '" + 
WebSession.getString(800) + 

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=1510096&r1=1510095&r2=1510096&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
 Sun Aug  4 04:26:26 2013
@@ -24,9 +24,13 @@ function getCalendarHeight() {
 }
 
 function setCalendarHeight() {
-    $('#${markupId}').fullCalendar('option', 'height', getCalendarHeight());
+       var cal = $('#${markupId}');
+       if (cal.length) {
+       cal.fullCalendar('option', 'height', getCalendarHeight());
+       }
 }
 
 $(function() {
     $(window).load(function() { setCalendarHeight(); } );
+    $(window).resize(function() { setCalendarHeight(); } );
 });