JBoss Rich Faces SVN: r8070 - in trunk: samples/calendar-sample/src/main/webapp/pages and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-04-22 10:56:39 -0400 (Tue, 22 Apr 2008)
New Revision: 8070
Modified:
trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java
trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
http://jira.jboss.com/jira/browse/RF-3106
http://jira.jboss.com/jira/browse/RF-3107
Modified: trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java
===================================================================
--- trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2008-04-22 14:54:36 UTC (rev 8069)
+++ trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarBean.java 2008-04-22 14:56:39 UTC (rev 8070)
@@ -57,6 +57,7 @@
private String todayControlMode;
private boolean showHeader;
private boolean showFooter;
+ private boolean resetTimeOnDateSelect;
private int counter;
@@ -110,6 +111,7 @@
boundary = "inactive";
disabled = false;
todayControlMode = "select";
+ resetTimeOnDateSelect = false;
}
@@ -274,4 +276,12 @@
public void setShowFooter(boolean showFooter) {
this.showFooter = showFooter;
}
+
+ public boolean isResetTimeOnDateSelect() {
+ return resetTimeOnDateSelect;
+ }
+
+ public void setResetTimeOnDateSelect(boolean resetTimeOnDateSelect) {
+ this.resetTimeOnDateSelect = resetTimeOnDateSelect;
+ }
}
\ No newline at end of file
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2008-04-22 14:54:36 UTC (rev 8069)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2008-04-22 14:56:39 UTC (rev 8070)
@@ -49,10 +49,6 @@
<calendar:calendar cellWidth="5" cellHeight="5"/>
<calendar:calendar cellWidth="40" cellHeight="40" popup="#{calendarBean.popup}"/>
<calendar:calendar
- onchanged = "alert('changed:'+this.value);"
- ontimeselected = "alert('time selectED:'+event.rich.date.toString());"
- ondateselected = "alert('date selectED:'+event.rich.date.toString());"
- ondateselect = "alert('date select:'+event.rich.date.toString());"
id="calendar"
dataModel="#{calendarDataModel}"
locale="#{calendarBean.locale}"
@@ -81,7 +77,8 @@
cellWidth="50"
mode="ajax"
showApplyButton="#{calendarBean.showApplyButton}"
- todayControlMode="#{calendarBean.todayControlMode}">
+ todayControlMode="#{calendarBean.todayControlMode}"
+ resetTimeOnDateSelect="#{calendarBean.resetTimeOnDateSelect}">
<f:facet name="optionalHeader">
<h:outputText value="optionalHeader Facet" />
</f:facet>
@@ -169,6 +166,9 @@
<h:selectBooleanCheckbox value="#{calendarBean.disabled}"
onclick="submit()">
</h:selectBooleanCheckbox>
+ <h:outputText value="resetTimeOnDateSelect:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{calendarBean.resetTimeOnDateSelect}" onclick="submit()">
+ </h:selectBooleanCheckbox>
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2008-04-22 14:54:36 UTC (rev 8069)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2008-04-22 14:56:39 UTC (rev 8070)
@@ -122,7 +122,7 @@
<classname>java.lang.Object</classname>
<description>Defines time that will be used:
1) to set time when the value is empty
- 2) to set time when date changes and flag "resetTimeOnDateChange" is true </description>
+ 2) to set time when date changes and flag "resetTimeOnDateSelect" is true </description>
<defaultvalue>getDefaultValueOfDefaultTime()</defaultvalue>
</property>
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-22 14:54:36 UTC (rev 8069)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-22 14:56:39 UTC (rev 8070)
@@ -323,11 +323,11 @@
Calendar calendar = getCalendar();
calendar.setTime(date);
- result.append(HOURS_VALUE).append(":");
+ result.append("{").append(HOURS_VALUE).append(":");
result.append(calendar.get(Calendar.HOUR_OF_DAY));
result.append(",");
result.append(MINUTES_VALUE).append(":");
- result.append(calendar.get(Calendar.MINUTE));
+ result.append(calendar.get(Calendar.MINUTE)).append("}");
return result.toString();
Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-04-22 14:54:36 UTC (rev 8069)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-04-22 14:56:39 UTC (rev 8070)
@@ -167,7 +167,7 @@
* @return hours and minutes from "defaultTime" attribute
*/
public String getPreparedDefaultTime(UICalendar calendar) {
- return calendar.getPreparedDefaultTime();
+ return calendar.getPreparedDefaultTime();
}
/**
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-04-22 14:54:36 UTC (rev 8069)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-04-22 14:56:39 UTC (rev 8070)
@@ -1333,13 +1333,14 @@
date.setDate(daydata.day);
if (this.timeType)
{
- if (this.selectedDate)
+ if (this.selectedDate && !this.params.resetTimeOnDateSelect)
{
date.setHours(this.selectedDate.getHours());
date.setMinutes(this.selectedDate.getMinutes());
} else
{
- date.setHours(12);
+ date.setHours(this.params.defaultTime.hours);
+ date.setMinutes(this.params.defaultTime.minutes);
}
}
@@ -1356,13 +1357,14 @@
var date = new Date(daydata.date);
if (this.timeType)
{
- if (this.selectedDate)
+ if (this.selectedDate && !this.params.resetTimeOnDateSelect)
{
date.setHours(this.selectedDate.getHours());
date.setMinutes(this.selectedDate.getMinutes());
} else
{
- date.setHours(12);
+ date.setHours(this.params.defaultTime.hours);
+ date.setMinutes(this.params.defaultTime.minutes);
}
}
@@ -1840,13 +1842,14 @@
var date = new Date(today.getFullYear(), today.getMonth(), today.getDate());
if (this.timeType)
{
- if (this.selectedDate)
+ if (this.selectedDate && !this.params.resetTimeOnDateSelect)
{
date.setHours(this.selectedDate.getHours());
date.setMinutes(this.selectedDate.getMinutes());
} else
{
- date.setHours(12);
+ date.setHours(this.params.defaultTime.hours);
+ date.setMinutes(this.params.defaultTime.minutes);
}
}
if (daydata.enabled && this.selectDate(date,true) && !this.showApplyButton)
@@ -1888,8 +1891,8 @@
var isDateChanged = false;
if ( (oldSelectedDate - newSelectedDate) && (oldSelectedDate!=null || newSelectedDate!=null) )
{
- isDateChanged = true
- flag = this.invokeEvent("dateselect", eventData.element, eventData.event, date)
+ isDateChanged = true;
+ flag = this.invokeEvent("dateselect", eventData.element, eventData.event, date);
}
if (flag)
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2008-04-22 14:54:36 UTC (rev 8069)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2008-04-22 14:56:39 UTC (rev 8070)
@@ -189,8 +189,8 @@
showWeeksBar:#{component.attributes['showWeeksBar']},
showWeekDaysBar:#{component.attributes['showWeekDaysBar']},
showApplyButton:#{component.attributes['showApplyButton']},
- resetTimeOnDateChange:#{component.attributes['resetTimeOnDateChange']} ,
- defaultTime: #{this:getPreparedDefaultTime(component)}
+ resetTimeOnDateSelect:#{component.attributes['resetTimeOnDateSelect']},
+ defaultTime:#{this:getPreparedDefaultTime(component)}
<f:call name="writeLabels" />
16 years, 8 months
JBoss Rich Faces SVN: r8069 - trunk/test-applications/jsp/src/main/java/pickList.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-04-22 10:54:36 -0400 (Tue, 22 Apr 2008)
New Revision: 8069
Modified:
trunk/test-applications/jsp/src/main/java/pickList/PickList.java
Log:
Change test for moveControlsVerticalAlign
Modified: trunk/test-applications/jsp/src/main/java/pickList/PickList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-04-22 14:54:25 UTC (rev 8068)
+++ trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-04-22 14:54:36 UTC (rev 8069)
@@ -50,7 +50,7 @@
this.listsHeight = "400";
this.valueCL = "---";
// this.localValueSet = ;
- this.moveControlsVerticalAlign = "30";
+ this.moveControlsVerticalAlign = "center";
this.removeAllControlLabel = "removeAllControlLabel";
this.removeControlLabel = "removeControlLabel";
this.rendered = true;
16 years, 8 months
JBoss Rich Faces SVN: r8068 - trunk/ui/combobox/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-04-22 10:54:25 -0400 (Tue, 22 Apr 2008)
New Revision: 8068
Modified:
trunk/ui/combobox/src/main/config/component/combobox.xml
Log:
http://jira.jboss.com/jira/browse/RF-2211
Modified: trunk/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/ui/combobox/src/main/config/component/combobox.xml 2008-04-22 14:54:21 UTC (rev 8067)
+++ trunk/ui/combobox/src/main/config/component/combobox.xml 2008-04-22 14:54:25 UTC (rev 8068)
@@ -263,12 +263,23 @@
replacing any message that comes from the validator
</description>
</property>
-
+
+
&html_input_attributes;
&html_input_events;
&html_events;
&ui_input_attributes;
-
+
+ <property hidden="true" existintag="false" exist="false">
+ <name>size</name>
+ <classname>int</classname>
+ <description></description>
+ </property>
+ <property hidden="true" existintag="false" exist="false">
+ <name>alt</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property>
<property hidden="true" existintag="false" exist="false" >
<name>localValueSet</name>
<classname>boolean</classname>
16 years, 8 months
JBoss Rich Faces SVN: r8067 - trunk/test-applications/facelets/src/main/java/pickList.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-04-22 10:54:21 -0400 (Tue, 22 Apr 2008)
New Revision: 8067
Modified:
trunk/test-applications/facelets/src/main/java/pickList/PickList.java
Log:
Change test for moveControlsVerticalAlign
Modified: trunk/test-applications/facelets/src/main/java/pickList/PickList.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/pickList/PickList.java 2008-04-22 14:48:26 UTC (rev 8066)
+++ trunk/test-applications/facelets/src/main/java/pickList/PickList.java 2008-04-22 14:54:21 UTC (rev 8067)
@@ -48,7 +48,7 @@
this.listsHeight = "400";
this.valueCL = "---";
// this.localValueSet = ;
- this.moveControlsVerticalAlign = "30";
+ this.moveControlsVerticalAlign = "center";
this.removeAllControlLabel = "removeAllControlLabel";
this.removeControlLabel = "removeControlLabel";
this.rendered = true;
16 years, 8 months
JBoss Rich Faces SVN: r8066 - trunk/test-applications/jsp/src/main/webapp/PickList.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-04-22 10:48:26 -0400 (Tue, 22 Apr 2008)
New Revision: 8066
Modified:
trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp
Log:
Add test for lang
Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-04-22 14:48:11 UTC (rev 8065)
+++ trunk/test-applications/jsp/src/main/webapp/PickList/PickListProperty.jsp 2008-04-22 14:48:26 UTC (rev 8066)
@@ -75,6 +75,9 @@
<h:commandButton actionListener="#{pickList.checkBinding}" value="Binding"></h:commandButton>
<h:outputText value="#{pickList.bindLabel}"></h:outputText>
+
+ <h:outputText value="lang"></h:outputText>
+ <h:inputText value="#{pickList.lang}" onchange="submit();"></h:inputText>
</h:panelGrid>
</f:subview>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r8065 - trunk/test-applications/facelets/src/main/webapp/PickList.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-04-22 10:48:11 -0400 (Tue, 22 Apr 2008)
New Revision: 8065
Modified:
trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml
Log:
Add test for lang
Modified: trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml 2008-04-22 14:47:58 UTC (rev 8064)
+++ trunk/test-applications/facelets/src/main/webapp/PickList/PickListProperty.xhtml 2008-04-22 14:48:11 UTC (rev 8065)
@@ -71,6 +71,9 @@
<h:commandButton actionListener="#{pickList.checkBinding}" value="Binding"></h:commandButton>
<h:outputText value="#{pickList.bindLabel}"></h:outputText>
+
+ <h:outputText value="lang"></h:outputText>
+ <h:inputText value="#{pickList.lang}" onchange="submit();"></h:inputText>
</h:panelGrid>
</f:subview>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r8064 - trunk/test-applications/jsp/src/main/webapp/PickList.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-04-22 10:47:58 -0400 (Tue, 22 Apr 2008)
New Revision: 8064
Modified:
trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
Log:
Add test for lang
Modified: trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-04-22 14:47:54 UTC (rev 8063)
+++ trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-04-22 14:47:58 UTC (rev 8064)
@@ -29,7 +29,8 @@
onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}"
onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
onmouseup="#{event.onmouseup}"
- binding="#{pickList.myPickList}">
+ binding="#{pickList.myPickList}"
+ lang="#{pickList.lang}">
<f:selectItems value="#{pickList.data}"/>
</rich:pickList>
<h:panelGrid columns="2">
16 years, 8 months
JBoss Rich Faces SVN: r8063 - in trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html: scripts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-04-22 10:47:54 -0400 (Tue, 22 Apr 2008)
New Revision: 8063
Modified:
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
Log:
http://jira.jboss.com/jira/browse/RF-1616
Modified: trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
--- trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2008-04-22 14:47:47 UTC (rev 8062)
+++ trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2008-04-22 14:47:54 UTC (rev 8063)
@@ -112,7 +112,7 @@
}
.rich-ordering-list-items {
- width: 100%;
+ /*width: 100%;*/
}
.rich-ordering-list-active {
Modified: trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
===================================================================
--- trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2008-04-22 14:47:47 UTC (rev 8062)
+++ trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2008-04-22 14:47:54 UTC (rev 8063)
@@ -37,6 +37,22 @@
this.headerTable.style.width = "100%";
}
}
+
+ if (Prototype.Browser.IE) {
+ //IE displays unnecessary horizontal scroll
+ //when vertical scroll's displayed
+ if (this.contentDiv && this.contentTable && this.getScrollWidth()) {
+ //alert(this.contentTable.offsetWidth +" "+ this.contentDiv.offsetWidth);
+ if (this.contentTable.offsetWidth && ((this.contentTable.offsetWidth <= this.contentDiv.clientWidth))) {
+ this.contentTable.style.width = this.contentDiv.clientWidth + "px";
+ this.headerTable.style.width = this.contentDiv.offsetWidth + "px";
+ this.contentDiv.style.overflowX = 'hidden';
+ }
+ } else {
+ this.contentTable.style.width = "100%";
+ this.headerTable.style.width = "100%";
+ }
+ }
}
LayoutManager.prototype.getScrollWidth = function() {
Modified: trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
===================================================================
--- trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2008-04-22 14:47:47 UTC (rev 8062)
+++ trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2008-04-22 14:47:54 UTC (rev 8063)
@@ -181,9 +181,6 @@
this.setFocus();
-
- //this.saveState();
- //this.layoutManager.widthSynchronization();
}
},
@@ -205,7 +202,6 @@
this.selectAll();
}
this.activeItem.item.doActive(this.getExtRowClass(this.activeItem.rowIndex), this.columnsClasses);
- //this.saveState();
Event.stop(event);
break;
}
@@ -222,8 +218,6 @@
this.autoScrolling(action, event);
- //this.saveState();
- //this.layoutManager.widthSynchronization();
},
changeActiveItems : function(newItem, item) {
@@ -247,41 +241,23 @@
* Click handler
*/
selectionItem : function(activeItem) {
- //var markedItem = this.getSelectItemByNode(activeItem);
var markedShuttleItem = activeItem;
- //if (markedItem != null) {
- this.resetMarked();
- /*if (markedItem._selected) {
- markedItem._selected = false;
- } else {
- markedItem._selected = true;
- this.selectedItems[0] = markedShuttleItem;
- }*/
- if (activeItem.item.isSelected()) {
- activeItem.item.doNormal(this.getExtRowClass(activeItem.rowIndex), this.columnsClasses);
- } else {
- activeItem.item.doSelect(this.getExtRowClass(activeItem.rowIndex), this.columnsClasses);
- this.selectedItems[0] = markedShuttleItem; //TODO: delete
- }
- //}
+ this.resetMarked();
+ if (activeItem.item.isSelected()) {
+ activeItem.item.doNormal(this.getExtRowClass(activeItem.rowIndex), this.columnsClasses);
+ } else {
+ activeItem.item.doSelect(this.getExtRowClass(activeItem.rowIndex), this.columnsClasses);
+ this.selectedItems[0] = markedShuttleItem; //TODO: delete
+ }
},
/**
* CTRL+Click handler
*/
addSelectedItem : function(activeItem) {
- //var markedItem = this.getSelectItemByNode(activeItem);
var markedShuttleItem = activeItem;
- /*if (markedItem._selected) {
- this.selectedItems.remove(markedShuttleItem);
- markedItem._selected = false;
- } else {
- markedItem._selected = true;
- this.selectedItems.push(markedShuttleItem);
- }*/
-
if (activeItem.item.isSelected()) {
this.selectedItems.remove(markedShuttleItem); //TODO :delete
activeItem.item.doNormal(this.getExtRowClass(activeItem.rowIndex), this.columnsClasses);
@@ -298,11 +274,6 @@
this.activeItem.item.doNormal(this.getExtRowClass(this.activeItem.rowIndex), this.columnsClasses);
}
}
-
- /*if (this.activeItem && !this.getSelectItemByNode(this.activeItem)._selected) {
- Richfaces.SelectItems.doNormal(this.activeItem);
- }*/
- //this.saveState();
},
/**
@@ -333,7 +304,6 @@
rows[i].item.doSelect(this.getExtRowClass(rows[i].rowIndex), this.columnsClasses);
this.selectedItems.push(rows[i]);
}
- //this.saveState();
},
resetMarked : function() {
@@ -385,15 +355,11 @@
setFocus : function() {
this.focusKeeper.focus();
this.focusKeeper.focused = true;
- //if (this.isListActive()) {
- // this.shuttleTable.className = Richfaces.ListBase.ORDERING_LIST_CLASSES.active;
- //}
},
focusListener : function(e) {
e = e || window.event;
this.focusKeeper.focused = false;
- //this.shuttleTable.className = Richfaces.ListBase.ORDERING_LIST_CLASSES.normal;
if (this.activeItem) {
if (this.activeItem.item.isSelected()) {
Modified: trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
===================================================================
--- trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2008-04-22 14:47:47 UTC (rev 8062)
+++ trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2008-04-22 14:47:54 UTC (rev 8063)
@@ -30,7 +30,7 @@
this.initControlList(containerId, ids);
for (var e in this.events) {
- if (e) {
+ if (e && this.events[e]) {
this.container.observe("rich:" + e.toString(), this.events[e]);
}
}
16 years, 8 months
JBoss Rich Faces SVN: r8062 - trunk/test-applications/facelets/src/main/webapp/PickList.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-04-22 10:47:47 -0400 (Tue, 22 Apr 2008)
New Revision: 8062
Modified:
trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml
Log:
Add test for lang
Modified: trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml 2008-04-22 14:47:32 UTC (rev 8061)
+++ trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml 2008-04-22 14:47:47 UTC (rev 8062)
@@ -30,7 +30,8 @@
onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}"
onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
onmouseup="#{event.onmouseup}"
- binding="#{pickList.myPickList}">
+ binding="#{pickList.myPickList}"
+ lang="#{pickList.lang}">
<f:selectItem itemValue="selectItem" itemLabel="selectItem" />
<f:selectItem itemValue="selectItem 1" itemLabel="selectItem 1" />
<f:selectItem itemValue="selectItem 2" itemLabel="selectItem 2" />
16 years, 8 months
JBoss Rich Faces SVN: r8061 - trunk/test-applications/jsp/src/main/java/pickList.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-04-22 10:47:32 -0400 (Tue, 22 Apr 2008)
New Revision: 8061
Modified:
trunk/test-applications/jsp/src/main/java/pickList/PickList.java
Log:
Add test for lang
Modified: trunk/test-applications/jsp/src/main/java/pickList/PickList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-04-22 14:47:13 UTC (rev 8060)
+++ trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-04-22 14:47:32 UTC (rev 8061)
@@ -38,7 +38,45 @@
private String valueCL;
private HtmlPickList myPickList = null;
private String bindLabel;
+ private String lang;
+
+ public PickList() {
+ this.copyAllControlLabel = "copyAllControlLabel";
+ this.copyControlLabel = "copyControlLabel";
+ this.dir = "alert('work')";
+ this.disabled = false;
+ this.fastOrderControlsVisible = true;
+ this.immediate = false;
+ this.listsHeight = "400";
+ this.valueCL = "---";
+ // this.localValueSet = ;
+ this.moveControlsVerticalAlign = "30";
+ this.removeAllControlLabel = "removeAllControlLabel";
+ this.removeControlLabel = "removeControlLabel";
+ this.rendered = true;
+ this.showButtonLabels = true;
+ this.size = 10;
+ this.sourceListWidth = "300";
+ this.switchByClick = false;
+ this.targetListWidth = "400";
+ this.title = "title";
+ this.required = false;
+ this.requiredMessage = "requiredMessage";
+ this.bindLabel = "Click Binding";
+ this.lang = "defaultLang";
+ data = new ArrayList<SelectItem>();
+ for (int i = 0; i < 10; i++)
+ data.add(new SelectItem("selectItems " + i));
+ }
+ public String getLang() {
+ return lang;
+ }
+
+ public void setLang(String lang) {
+ this.lang = lang;
+ }
+
public HtmlPickList getMyPickList() {
return myPickList;
}
@@ -79,35 +117,6 @@
this.requiredMessage = requiredMessage;
}
- public PickList() {
- this.copyAllControlLabel = "copyAllControlLabel";
- this.copyControlLabel = "copyControlLabel";
- this.dir = "alert('work')";
- this.disabled = false;
- this.fastOrderControlsVisible = true;
- this.immediate = false;
- this.listsHeight = "400";
- this.valueCL = "---";
- // this.localValueSet = ;
- this.moveControlsVerticalAlign = "30";
- this.removeAllControlLabel = "removeAllControlLabel";
- this.removeControlLabel = "removeControlLabel";
- this.rendered = true;
- this.showButtonLabels = true;
- this.size = 10;
- this.sourceListWidth = "300";
- this.switchByClick = false;
- this.targetListWidth = "400";
- this.title = "title";
- this.required = false;
- this.requiredMessage = "requiredMessage";
- this.bindLabel = "Click Binding";
- data = new ArrayList<SelectItem>();
- for (int i = 0; i < 10; i++)
- data.add(new SelectItem("selectItems " + i));
-
- }
-
public void valueChangeListener(ValueChangeEvent event) {
valueCL = "valueChangeListener work!";
}
16 years, 8 months