You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jl...@apache.org on 2006/06/17 21:40:41 UTC
svn commit: r415049 - in
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer:
AbstractCompactScheduleRenderer.java DefaultScheduleEntryRenderer.java
Author: jlust
Date: Sat Jun 17 12:40:40 2006
New Revision: 415049
URL: http://svn.apache.org/viewvc?rev=415049&view=rev
Log:
fix for the schedule tooltip rendering + fix for the schedule mouse event in the compact view. See issue TOMAHAWK-487 for both. Thanks to Peter Mahoney.
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractCompactScheduleRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/DefaultScheduleEntryRenderer.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractCompactScheduleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractCompactScheduleRenderer.java?rev=415049&r1=415048&r2=415049&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractCompactScheduleRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractCompactScheduleRenderer.java Sat Jun 17 12:40:40 2006
@@ -247,6 +247,16 @@
"width: 100%; height: 100%; overflow: auto; vertical-align: top;",
null);
writer.writeAttribute(HTML.ID_ATTR, dayBodyId, null);
+
+ //this extra div is required, because when a scrollbar is visible and
+ //it is clicked, the fireScheduleTimeClicked() method is fired.
+ writer.startElement(HTML.DIV_ELEM, schedule);
+ writer
+ .writeAttribute(
+ HTML.STYLE_ATTR,
+ "width: 100%; height: 100%; vertical-align: top;",
+ null);
+
//register an onclick event listener to a day cell which will capture
//the date
if (!schedule.isReadonly() && schedule.isSubmitOnClick()) {
@@ -265,6 +275,7 @@
writeEntries(context, schedule, day, writer);
writer.endElement(HTML.TABLE_ELEM);
+ writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/DefaultScheduleEntryRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/DefaultScheduleEntryRenderer.java?rev=415049&r1=415048&r2=415049&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/DefaultScheduleEntryRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/DefaultScheduleEntryRenderer.java Sat Jun 17 12:40:40 2006
@@ -193,7 +193,7 @@
return null;
}
- return text.replaceAll("'", """);
+ return text.replaceAll("'", "\\\\\'").replaceAll("\n", "\\\\n").replaceAll("\r", "\\\\r");
}
/**