JBoss Rich Faces SVN: r3795 - branches/3.1.x/ui/calendar/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-11-06 08:56:22 -0500 (Tue, 06 Nov 2007)
New Revision: 3795
Modified:
branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml
Log:
RF-933
Additional commit
Modified: branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2007-11-06 13:33:04 UTC (rev 3794)
+++ branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2007-11-06 13:56:22 UTC (rev 3795)
@@ -476,8 +476,6 @@
</description>
<defaultvalue>0</defaultvalue>
</property>
-
- <property>
</component>
&listeners;
18 years, 6 months
JBoss Rich Faces SVN: r3792 - management/design/contextMenu.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-11-06 07:42:14 -0500 (Tue, 06 Nov 2007)
New Revision: 3792
Modified:
management/design/contextMenu/FuncSpec - Context Menu.doc
Log:
Modified: management/design/contextMenu/FuncSpec - Context Menu.doc
===================================================================
(Binary files differ)
18 years, 6 months
JBoss Rich Faces SVN: r3791 - in branches/3.1.x/ui/calendar/src/main: java/org/richfaces/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-11-06 07:29:21 -0500 (Tue, 06 Nov 2007)
New Revision: 3791
Modified:
branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml
branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
RF-933
Merged with branch.
Modified: branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2007-11-06 12:25:15 UTC (rev 3790)
+++ branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2007-11-06 12:29:21 UTC (rev 3791)
@@ -41,7 +41,7 @@
org.ajax4jsf.tests.AbstractAjax4JsfTestCase
</superclassname>
</test>
- </tag>
+ </tag>
<!--
<taghandler>
<classname>org.ajax4jsf.tag.TestHandler</classname>
@@ -86,9 +86,9 @@
</description>
<defaultvalue>getDefaultTimeZone()</defaultvalue>
</property>
- <property elonly="true">
+ <property>
<name>preloadDateRangeBegin</name>
- <classname>java.util.Date</classname>
+ <classname>java.lang.Object</classname>
<description>
Define the initial range of date which will be loaded to
client from dataModel under rendering
@@ -97,9 +97,9 @@
getDefaultPreloadBegin(getCurrentDateOrDefault())
</defaultvalue>
</property>
- <property elonly="true">
+ <property>
<name>preloadDateRangeEnd</name>
- <classname>java.util.Date</classname>
+ <classname>java.lang.Object</classname>
<description>
Defines the last range of date which will be loaded to
client from dataModel under rendering
@@ -108,15 +108,18 @@
getDefaultPreloadEnd(getCurrentDateOrDefault())
</defaultvalue>
</property>
- <property elonly="true">
+ <property>
<name>currentDate</name>
- <classname>java.util.Date</classname>
- <description>Defines current date</description>
+ <classname>java.lang.Object</classname>
+ <description>Defines current date</description>
</property>
<property>
<name>currentDateChangeListener</name>
<classname>javax.faces.el.MethodBinding</classname>
- <description>MethodBinding representing an action listener method that will be notified after date selection</description>
+ <description>
+ MethodBinding representing an action listener method
+ that will be notified after date selection
+ </description>
</property>
<property>
<name>datePattern</name>
@@ -124,7 +127,7 @@
<description>Defines date pattern</description>
<defaultvalue>"MMM d, yyyy"</defaultvalue>
</property>
-
+
<property>
<name>popup</name>
<classname>boolean</classname>
@@ -194,7 +197,7 @@
months. Should accept list with the month names
</description>
</property>
-
+
<property>
<name>toolTipMode</name>
<classname>java.lang.String</classname>
@@ -273,7 +276,7 @@
<description>
Style Class attribute for the popup button
</description>
- </property>
+ </property>
<property>
<name>zindex</name>
<classname>int</classname>
@@ -316,116 +319,88 @@
<property>
<name>ondateselect</name>
<classname>java.lang.String</classname>
- <description>
- onDateSelect event handler
- </description>
+ <description>onDateSelect event handler</description>
</property>
<property>
<name>ondateselected</name>
<classname>java.lang.String</classname>
- <description>
- onDateSelected event handler
- </description>
- </property>
+ <description>onDateSelected event handler</description>
+ </property>
<property>
<name>oncurrentdateselect</name>
<classname>java.lang.String</classname>
- <description>
- onCurrentDateSelect event handler
- </description>
- </property>
+ <description>onCurrentDateSelect event handler</description>
+ </property>
<property>
<name>onexpand</name>
<classname>java.lang.String</classname>
- <description>
- onExpand event handler
- </description>
+ <description>onExpand event handler</description>
</property>
<property>
<name>oncollapse</name>
<classname>java.lang.String</classname>
- <description>
- onCollapse event handler
- </description>
+ <description>onCollapse event handler</description>
</property>
<property>
<name>ondatemouseover</name>
<classname>java.lang.String</classname>
- <description>
- onDateMouseOver event handler
- </description>
- </property>
+ <description>onDateMouseOver event handler</description>
+ </property>
<property>
<name>ondatemouseout</name>
<classname>java.lang.String</classname>
- <description>
- onDateMouseOut event handler
- </description>
- </property>
-
+ <description>onDateMouseOut event handler</description>
+ </property>
+
<property>
<name>oninputchange</name>
<classname>java.lang.String</classname>
- <description>
- input onChange event handler
- </description>
+ <description>input onChange event handler</description>
</property>
<property>
<name>oninputselect</name>
<classname>java.lang.String</classname>
- <description>
- input onSelect event handler
- </description>
+ <description>input onSelect event handler</description>
</property>
<property>
<name>oninputfocus</name>
<classname>java.lang.String</classname>
- <description>
- input onFocus event handler
- </description>
+ <description>input onFocus event handler</description>
</property>
<property>
<name>oninputblur</name>
<classname>java.lang.String</classname>
- <description>
- input onBlur event handler
- </description>
+ <description>input onBlur event handler</description>
</property>
<property>
<name>oninputclick</name>
<classname>java.lang.String</classname>
- <description>
- input onClick event handler
- </description>
- </property>
+ <description>input onClick event handler</description>
+ </property>
<property>
<name>oninputkeypress</name>
<classname>java.lang.String</classname>
- <description>
- input onKeyPress event handler
- </description>
+ <description>input onKeyPress event handler</description>
</property>
<property>
<name>oninputkeydown</name>
<classname>java.lang.String</classname>
- <description>
- input onKeyDown event handler
- </description>
+ <description>input onKeyDown event handler</description>
</property>
<property>
<name>oninputkeyup</name>
<classname>java.lang.String</classname>
- <description>
- input onKeyUp event handler
- </description>
- </property>
-
+ <description>input onKeyUp event handler</description>
+ </property>
+
<property hidden="true">
<name>localValueSet</name>
+ <classname>boolean</classname>
<description>localValueSet</description>
</property>
<property hidden="true">
<name>valid</name>
+ <classname>boolean</classname>
<description>valid</description>
</property>
<property hidden="true">
@@ -436,7 +411,10 @@
<property>
<name>ajaxSingle</name>
<classname>boolean</classname>
- <description>if "true", submits ONLY one field/link, instead of all form controls</description>
+ <description>
+ if "true", submits ONLY one field/link, instead of all
+ form controls
+ </description>
<defaultvalue>true</defaultvalue>
</property>
@@ -444,24 +422,33 @@
<name>data</name>
<classname>java.lang.Object</classname>
</property>
-
+
<property>
<name>buttonIcon</name>
<classname>java.lang.String</classname>
- <description>Defines icon for the popup button element. The attribute is ignored if the "buttonLabel" is set</description>
+ <description>
+ Defines icon for the popup button element. The attribute
+ is ignored if the "buttonLabel" is set
+ </description>
</property>
-
+
<property>
<name>buttonLabel</name>
<classname>java.lang.String</classname>
- <description>Defines label for the popup button element. If the attribute is set "buttonIcon" and "buttonIconDisabled" are ignored
+ <description>
+ Defines label for the popup button element. If the
+ attribute is set "buttonIcon" and "buttonIconDisabled"
+ are ignored
</description>
</property>
-
+
<property>
<name>buttonIconDisabled</name>
<classname>java.lang.String</classname>
- <description>Defines disabled icon for the popup button element. The attribute is ignored if the "buttonLabel" is set</description>
+ <description>
+ Defines disabled icon for the popup button element. The
+ attribute is ignored if the "buttonLabel" is set
+ </description>
</property>
<property>
<name>mode</name>
@@ -469,26 +456,30 @@
<defaultvalue>UICalendar.CLIENT_MODE</defaultvalue>
<description>Valid values = ajax or client</description>
</property>
-
+
<property>
- <name>horizontalOffset</name>
- <classname>int</classname>
- <description>
- Sets the horizontal offset between button and calendar element conjunction point
- </description>
- <defaultvalue>0</defaultvalue>
- </property>
+ <name>horizontalOffset</name>
+ <classname>int</classname>
+ <description>
+ Sets the horizontal offset between button and calendar
+ element conjunction point
+ </description>
+ <defaultvalue>0</defaultvalue>
+ </property>
- <property>
- <name>verticalOffset</name>
- <classname>int</classname>
- <description>
- Sets the vertical offset between button and calendar element conjunction point
- </description>
- <defaultvalue>0</defaultvalue>
- </property>
+ <property>
+ <name>verticalOffset</name>
+ <classname>int</classname>
+ <description>
+ Sets the vertical offset between button and calendar
+ element conjunction point
+ </description>
+ <defaultvalue>0</defaultvalue>
+ </property>
+ <property>
+
</component>
- &listeners;
+ &listeners;
</components>
Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-11-06 12:25:15 UTC (rev 3790)
+++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-11-06 12:29:21 UTC (rev 3791)
@@ -53,6 +53,9 @@
import org.richfaces.model.CalendarDataModelItem;
import org.richfaces.renderkit.CalendarRendererBase;
+import java.text.DateFormat;
+
+
// import org.richfaces.renderkit.html.BaseGradient.Data;
/**
@@ -79,17 +82,17 @@
public abstract void setTimeZone(TimeZone timeZone);
- public abstract Date getPreloadDateRangeBegin();
+ public abstract Object getPreloadDateRangeBegin();
- public abstract void setPreloadDateRangeBegin(Date date);
+ public abstract void setPreloadDateRangeBegin(Object date);
- public abstract Date getPreloadDateRangeEnd();
+ public abstract Object getPreloadDateRangeEnd();
- public abstract void setPreloadDateRangeEnd(Date date);
+ public abstract void setPreloadDateRangeEnd(Object date);
- public abstract Date getCurrentDate();
+ public abstract Object getCurrentDate();
- public abstract void setCurrentDate(Date date);
+ public abstract void setCurrentDate(Object date);
public abstract CalendarDataModel getDataModel();
@@ -155,7 +158,7 @@
public abstract int getVerticalOffset();
public abstract void setVerticalOffset(int verticalOffset);
-
+
public abstract int getHorizontalOffset();
public abstract void setHorizontalOffset(int horizontalOffset);
@@ -191,16 +194,30 @@
super.validateValue(context, newValue);
}
- public void updateCurrentDate(FacesContext context, Date currentDate) {
+ public void updateCurrentDate(FacesContext context, Object currentDate) {
if (context == null) {
throw new NullPointerException();
}
+ //RF-1073
try {
ValueBinding vb = getValueBinding("currentDate");
if (vb != null) {
- vb.setValue(context, currentDate);
- return;
+ if(vb.getType(context).equals(String.class)){
+ DateTimeConverter convert = new DateTimeConverter();
+ convert.setLocale(getLocale());
+ convert.setPattern(getDatePattern());
+ vb.setValue(context,convert.getAsString(context, this, currentDate));
+ return;
+ }else if(vb.getType(context).equals(Calendar.class)){
+ Calendar c = Calendar.getInstance();
+ c.setTime((Date) currentDate);
+ vb.setValue(context, c);
+ return;
+ }else{
+ vb.setValue(context, currentDate);
+ return;
+ }
} else {
setCurrentDate(currentDate);
}
@@ -222,7 +239,7 @@
public Date getCurrentDateOrDefault() {
- Date date = getCurrentDate();
+ Date date = getAsDate(getCurrentDate());
if (date != null) {
return date;
@@ -405,7 +422,7 @@
} else {
Date currentDate1 = dateChangeEvent.getCurrentDate();
- Date currentDate2 = getCurrentDate();
+ Date currentDate2 = getAsDate(getCurrentDate());
if (!currentDate1.equals(currentDate2)) {
updateCurrentDate(facesContext, currentDate1);
ValueChangeEvent changeEvent = new ValueChangeEvent(
@@ -443,8 +460,8 @@
}
public Date[] getPreloadDateRange() {
- Date dateRangeBegin = this.getPreloadDateRangeBegin();
- Date dateRangeEnd = this.getPreloadDateRangeEnd();
+ Date dateRangeBegin = getAsDate(this.getPreloadDateRangeBegin());
+ Date dateRangeEnd = getAsDate(this.getPreloadDateRangeEnd());
if (dateRangeBegin == null && dateRangeEnd == null) {
return null;
Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-06 12:25:15 UTC (rev 3790)
+++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-06 12:29:21 UTC (rev 3791)
@@ -99,11 +99,12 @@
}
UICalendar calendar = (UICalendar) component;
if (calendar.getConverter() != null) {
-
- return calendar.getConverter().getAsObject(context, component, (String)submittedValue);
-
+
+ return calendar.getConverter().getAsObject(context, component,
+ (String) submittedValue);
+
} else {
- DateTimeConverter converter = new DateTimeConverter();
+ DateTimeConverter converter = new DateTimeConverter();
converter.setPattern(calendar.getDatePattern());
converter.setLocale(calendar.getLocale());
converter.setTimeZone(calendar.getTimeZone());
@@ -232,31 +233,18 @@
UICalendar input = (UICalendar) component;
// XXX nick - nick - can contain either Date or String instance
- Object value = input.getSubmittedValue();
- Object curVal = input.getValue();
- if (value == null) {
+ Date value = input.getAsDate(input.getSubmittedValue());
+ Date curVal = input.getAsDate(input.getValue());
- DateTimeConverter converter = new DateTimeConverter();
- converter.setPattern(input.getDatePattern());
- converter.setLocale(input.getLocale());
- converter.setTimeZone(input.getTimeZone());
+ DateTimeConverter converter = new DateTimeConverter();
+ converter.setPattern(input.getDatePattern());
+ converter.setLocale(input.getLocale());
+ converter.setTimeZone(input.getTimeZone());
+ if (value == null) {
return converter.getAsString(context, input, curVal);
- }
- if (value instanceof Date) {
-
- DateTimeConverter converter = new DateTimeConverter();
- converter.setPattern(input.getDatePattern());
- converter.setLocale(input.getLocale());
+ } else {
return converter.getAsString(context, input, value);
}
- if (value instanceof String) {
-
- Converter converter = SelectUtils.getConverterForProperty(context,
- input, "value");
- return converter.getAsString(context, input, value);
-
- }
- return null;
}
public void writeSymbols(FacesContext facesContext, UICalendar calendar)
@@ -358,18 +346,13 @@
public String getSelectedDate(FacesContext context, UICalendar calendar)
throws IOException {
- Object submittedValue = calendar.getSubmittedValue();
+ Date submittedValue = calendar.getAsDate(calendar.getSubmittedValue());
Date date;
- if (submittedValue instanceof String) {
- Converter converter = SelectUtils.getConverterForProperty(context,
- calendar, "value");
- date = (Date) converter.getAsObject(context, calendar,
- (String) submittedValue);
- } else if (submittedValue != null) {
- date = (Date) submittedValue;
+ if (submittedValue != null) {
+ date = submittedValue;
} else {
- date = (Date) calendar.getValue();
+ date = calendar.getAsDate(calendar.getValue());
}
if (date != null) {
@@ -383,9 +366,9 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
JSFunction result = new JSFunction("new Date");
- result.addParameter(new Integer(calendar.get(Calendar.YEAR)));
- result.addParameter(new Integer(calendar.get(Calendar.MONTH)));
- result.addParameter(new Integer(calendar.get(Calendar.DATE)));
+ result.addParameter(Integer.valueOf(calendar.get(Calendar.YEAR)));
+ result.addParameter(Integer.valueOf(calendar.get(Calendar.MONTH)));
+ result.addParameter(Integer.valueOf(calendar.get(Calendar.DATE)));
return result;
}
18 years, 6 months
JBoss Rich Faces SVN: r3790 - in trunk/sandbox/ui/orderingList/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-11-06 07:25:15 -0500 (Tue, 06 Nov 2007)
New Revision: 3790
Modified:
trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
Log:
Correction of component loading
Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-11-06 12:16:41 UTC (rev 3789)
+++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-11-06 12:25:15 UTC (rev 3790)
@@ -1,5 +1,4 @@
LayoutManager = function(headerId, contentId) {
- alert('');
this.headerTable = document.getElementById(headerId);
this.contentTable = document.getElementById(contentId);
this.headerDiv = this.headerTable.parentNode;
Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-11-06 12:16:41 UTC (rev 3789)
+++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-11-06 12:25:15 UTC (rev 3790)
@@ -54,8 +54,6 @@
Shuttle.prototype.init = function(contentTableId, headerTableId, upControlId, downControlId, firstControlId, lastControlId, onclickControlId, focusKeeperId) {
var obj = this;
Shuttle.setFocus(focusKeeperId);
- var layoutManager = new LayoutManager(headerTableId, contentTableId);
- layoutManager.widthSynchronization();
document.getElementById(upControlId).onclick = function() {obj.moveSelectedItems('up');};
document.getElementById(downControlId).onclick = function() {obj.moveSelectedItems('down');};
document.getElementById(firstControlId).onclick = function() {obj.moveSelectedItems('first');};
Modified: trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
===================================================================
--- trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-06 12:16:41 UTC (rev 3789)
+++ trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-06 12:25:15 UTC (rev 3790)
@@ -50,11 +50,20 @@
<a id="#{clientId}last" href="#" >last</a>
</div>
<f:clientId var="cId"/>
- <script type="text/javascript">'#{cId}'
+ <script type="text/javascript">
+ var clientId = '#{cId}';
+ if (window.attachEvent) {
+ window.attachEvent("onload", init);
+ } else {
+ window.addEventListener("load", init, false);
+ }
document.body.onselectstart = function() {return false;};
document.body.className = "body";
- var shuttle = new Shuttle('#{cId}', '#{cId}internal_tab', '#{cId}internal_header_tab',
- '#{cId}focusKeeper', '#{cId}valueKeeper','#{cId}up', '#{cId}down', '#{cId}first',
- '#{cId}last', '#{cId}sortLabel');
+
+ var shuttle = new Shuttle('#{cId}', '#{cId}internal_tab', '#{cId}internal_header_tab', '#{cId}focusKeeper', '#{cId}valueKeeper','#{cId}up', '#{cId}down', '#{cId}first', '#{cId}last', '#{cId}sortLabel');
+ function init() {
+ var layoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab');
+ layoutManager.widthSynchronization();
+ }
</script>
</f:root>
\ No newline at end of file
18 years, 6 months
JBoss Rich Faces SVN: r3789 - trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-11-06 07:16:41 -0500 (Tue, 06 Nov 2007)
New Revision: 3789
Modified:
trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
Log:
remove unnecessary attributes from image method
Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java
===================================================================
--- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-11-06 12:12:12 UTC (rev 3788)
+++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-11-06 12:16:41 UTC (rev 3789)
@@ -72,7 +72,7 @@
}
if (align.equalsIgnoreCase(from)){
- image(context,component, from, align);
+ image(context,component, from);
} else {
String iconType = PANEL_MENU_SPACER_ICON_NAME;
String imageSrc = getIconByType(iconType, isTopLevel, context, component);
@@ -80,7 +80,7 @@
}
}
- private void image(FacesContext context, UIComponent component, String from, String iconPos)
+ private void image(FacesContext context, UIComponent component, String from)
throws IOException{
UIPanelMenu panelMenu = findMenu(component);
18 years, 6 months
JBoss Rich Faces SVN: r3788 - in trunk/ui/panelmenu/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-11-06 07:12:12 -0500 (Tue, 06 Nov 2007)
New Revision: 3788
Modified:
trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx
Log:
fix RF-1288
Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
===================================================================
--- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2007-11-06 12:10:24 UTC (rev 3787)
+++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2007-11-06 12:12:12 UTC (rev 3788)
@@ -79,7 +79,7 @@
}
if (align.equalsIgnoreCase(from)){
- image(context,component, from + "Icon" + component.getClientId(context), align);
+ image(context,component, from + "Icon" + component.getClientId(context));
} else {
String iconType = PANEL_MENU_SPACER_ICON_NAME;
String imageSrc = getIconByType(iconType, isTopLevel, context, component);
@@ -87,7 +87,7 @@
}
}
- private void image(FacesContext context, UIComponent component, String id, String iconPos )throws IOException {
+ private void image(FacesContext context, UIComponent component, String id)throws IOException {
ResponseWriter writer = context.getResponseWriter();
UIPanelMenu panelMenu = findMenu(component);
@@ -242,7 +242,16 @@
return value;
}
-
+
+ public String getSelectedClass(FacesContext context, UIComponent component){
+ StringBuffer selectedClass = null;
+ if(isSelected(context, component)){
+ selectedClass= new StringBuffer();
+ selectedClass.append(UIPanelMenu.DEFAULT_SELECTED_CLASS).append(" ").append(UIPanelMenu.USER_DEFINED_SELECTED_CLASS);
+ }
+ return selectedClass != null ? selectedClass.toString() : "";
+ }
+
public String getLabelClass(FacesContext context, UIComponent component) {
UIPanelMenuGroup group = (UIPanelMenuGroup)component;
UIPanelMenu parentMenu = findMenu(group);
@@ -252,9 +261,7 @@
resClass.append("rich-pmenu-group-self-label rich-pmenu-top-group-self-label");
} else resClass.append("rich-pmenu-group-self-label");
}
- if(isSelected(context, component)){
- resClass.append(" ").append(UIPanelMenu.DEFAULT_SELECTED_CLASS).append(" ").append(UIPanelMenu.USER_DEFINED_SELECTED_CLASS);
- }
+
return resClass.toString();
}
Modified: trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx
===================================================================
--- trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-06 12:10:24 UTC (rev 3787)
+++ trunk/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-11-06 12:12:12 UTC (rev 3788)
@@ -27,7 +27,7 @@
<f:call name="utils.encodePassThru" />
- <tr>
+ <tr class="#{this:getSelectedClass( context, component )}">
<td class="dr-pmenu-nowrap #{this:getIconClass( context, component,'left')}">
<f:call name="insertSpacerImages" />
<f:call name="insertImage">
18 years, 6 months
JBoss Rich Faces SVN: r3787 - trunk/ui/dropdown-menu/design/funcspec.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-11-06 07:10:24 -0500 (Tue, 06 Nov 2007)
New Revision: 3787
Modified:
trunk/ui/dropdown-menu/design/funcspec/FuncSpec - RF Menu Component.doc
Log:
Modified: trunk/ui/dropdown-menu/design/funcspec/FuncSpec - RF Menu Component.doc
===================================================================
(Binary files differ)
18 years, 6 months
JBoss Rich Faces SVN: r3786 - management/design/contextMenu.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-11-06 07:08:23 -0500 (Tue, 06 Nov 2007)
New Revision: 3786
Added:
management/design/contextMenu/FuncSpec - Context Menu.doc
Log:
Added: management/design/contextMenu/FuncSpec - Context Menu.doc
===================================================================
(Binary files differ)
Property changes on: management/design/contextMenu/FuncSpec - Context Menu.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 6 months