You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2005/09/15 12:17:49 UTC
svn commit: r289189 - in
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar:
HtmlCalendarRenderer.java resource/popcalendar.js
Author: baranda
Date: Thu Sep 15 03:17:43 2005
New Revision: 289189
URL: http://svn.apache.org/viewcvs?rev=289189&view=rev
Log:
Fixes MYFACES-569
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/resource/popcalendar.js
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=289189&r1=289188&r2=289189&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Thu Sep 15 03:17:43 2005
@@ -259,7 +259,7 @@
writer.startElement(HTML.SCRIPT_ELEM, component);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
writer.write(
- "jscalendarSetImageDirectory(\""
+ "loadPopupScript();jscalendarSetImageDirectory(\""
+JavascriptUtils.encodeString(
AddResource.getResourceMappedPath(HtmlCalendarRenderer.class, "DB/", facesContext)
)
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/resource/popcalendar.js
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/resource/popcalendar.js?rev=289189&r1=289188&r2=289189&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/resource/popcalendar.js (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/resource/popcalendar.js Thu Sep 15 03:17:43 2005
@@ -616,20 +616,22 @@
jscalendarBShow = false;
}
-if(jscalendarIe)
- jscalendarInit();
-else
-{
- var jscalendarOnloadBackup = window.onload;
-
- function jscalendarOnload()
- {
- if(jscalendarOnloadBackup!=null)
- jscalendarOnloadBackup();
- jscalendarInit();
- }
-
- window.onload=jscalendarOnload;
+function loadPopupScript() {
+ if(jscalendarIe)
+ jscalendarInit();
+ else
+ {
+ var jscalendarOnloadBackup = window.onload;
+
+ function jscalendarOnload()
+ {
+ if(jscalendarOnloadBackup!=null)
+ jscalendarOnloadBackup();
+ jscalendarInit();
+ }
+
+ window.onload=jscalendarOnload;
+ }
}