JBoss Rich Faces SVN: r7810 - in trunk/ui/inplaceSelect/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-04-14 12:09:05 -0400 (Mon, 14 Apr 2008)
New Revision: 7810
Modified:
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
Log:
http://jira.jboss.com/jira/browse/RF-3058, http://jira.jboss.com/jira/browse/RF-3059
Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-04-14 16:07:48 UTC (rev 7809)
+++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-04-14 16:09:05 UTC (rev 7810)
@@ -174,9 +174,10 @@
|| (this.clickOnBar || !this.comboList.isList)) {
//bug : http://jira.jboss.com/jira/browse/RF-2810,
//will be corrected in a future version (http://jira.jboss.com/jira/browse/RF-2814)
- this.invokeEvent(this.events.onchange, this.inplaceSelect, "onchange", {itemValue : this.currentItemValue, itemText : this.tempValueKeeper.value});
- var unescapeText = this.tempValueKeeper.value.unescapeHTML();
- this.saveValue(this.currentItemValue, unescapeText);
+ var unescapedValue = this.currentItemValue;
+ this.invokeEvent(this.events.onchange, this.inplaceSelect, "onchange", {itemValue : unescapedValue, itemText : this.tempValueKeeper.value});
+// var unescapeText = this.tempValueKeeper.value.unescapeHTML();
+ this.saveValue(unescapedValue, this.tempValueKeeper.value);
}
this.comboList.hide();
@@ -184,7 +185,7 @@
applyTmpValue : function() {
if (this.comboList.activeItem) {
- var userLabel = this.comboList.activeItem.innerHTML;
+ var userLabel = this.comboList.activeItem.innerHTML.unescapeHTML();
this.currentItemValue = this.comboList.activeItem.value;
this.tempValueKeeper.value = userLabel;
this.comboList.selectedItem = this.comboList.activeItem;
@@ -218,7 +219,7 @@
if (item) {
this.comboList.doSelectItem(item);
- $super(e, item.innerHTML);
+ $super(e, item.innerHTML.unescapeHTML());
} else {
$super(e, "");
}
Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
===================================================================
--- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-14 16:07:48 UTC (rev 7809)
+++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-14 16:09:05 UTC (rev 7810)
@@ -36,13 +36,18 @@
}
String fieldLabel = getSelectedItemLabel(context, component);
value = getConvertedStringValue(context, component,value);
- Object fieldValue = value;
+ String fieldValue = (String)value;
if (value == null || value.equals("")) {
fieldValue = "";
}
+
+
+ String encodedFieldValue = encodeValue(fieldValue);
+
variables.setVariable("fieldLabel", fieldLabel);
variables.setVariable("fieldValue", fieldValue);
+ variables.setVariable("encodedFieldValue", encodedFieldValue);
String saveIcon = (String)component.getAttributes().get("saveControlIcon");
if (saveIcon != null && saveIcon.length() != 0 ) {
@@ -111,7 +116,7 @@
/>
<input id="#{clientId}inselArrow" readonly="readonly" type="Text" value="" class="rich-inplace-select-arrow" style='display:none;'/>
- <input id='#{clientId}inplaceValue' name='#{clientId' type='hidden' value='#{fieldValue}'
+ <input id='#{clientId}inplaceValue' name='#{clientId}' type='hidden' value='#{fieldValue}'
onchange='#{component.attributes["onchange"]}'>
</input>
<div id="#{clientId}bar" class="rich-inplace-select-control-set" style="display:none;">
@@ -212,7 +217,7 @@
new Richfaces.InplaceSelect(new Richfaces.InplaceSelectList('list#{clientId}', 'listParent#{clientId}', true,
Richfaces.InplaceSelect.CLASSES.COMBO_LIST, '#{component.attributes["listWidth"]}', '#{component.attributes["listHeight"]}', #{this:getItemsTextAsJSArray(context, component,items)}, null,
- '#{clientId}inplaceTmpValue', 'shadow#{clientId}', 0, 0, '#{fieldValue}'),
+ '#{clientId}inplaceTmpValue', 'shadow#{clientId}', 0, 0, #{encodedFieldValue}),
'#{clientId}', '#{clientId}inplaceTmpValue',
'#{clientId}inplaceValue', '#{clientId}tabber',
{defaultLabel : '#{component.attributes["defaultLabel"]}',
16 years, 9 months
JBoss Rich Faces SVN: r7809 - in trunk/ui/combobox/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-04-14 12:07:48 -0400 (Mon, 14 Apr 2008)
New Revision: 7809
Modified:
trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
trunk/ui/combobox/src/main/templates/combobox.jspx
Log:
http://jira.jboss.com/jira/browse/RF-3058
Modified: trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-04-14 16:02:38 UTC (rev 7808)
+++ trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-04-14 16:07:48 UTC (rev 7809)
@@ -140,4 +140,8 @@
JSFunctionDefinition script = getUtils().getAsEventHandler(context, component, attributeName, null);
return ScriptUtils.toScript(script);
}
+
+ public String encodeValue(String value){
+ return ScriptUtils.toScript(value);
+ }
}
Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-04-14 16:02:38 UTC (rev 7808)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-04-14 16:07:48 UTC (rev 7809)
@@ -31,10 +31,13 @@
this.comboList = new Richfaces.ComboBoxList(listId, parentListId, selectFirstOnUpdate, classes.COMBO_LIST, listWidth,
listHeight, itemsText, onlistcall, fieldId, shadowId, showDelay, hideDelay);
this.defaultMessage = defaultMessage;
+ // TODO: should we move this logic to the template?
+ // http://jira.jboss.com/jira/browse/RF-2956
if (value) {
var item = this.comboList.findItemBySubstr(value);
if (item) {
this.comboList.doSelectItem(item);
+ this.comboValue.value = item.innerHTML.unescapeHTML();
}
} else {
if (this.defaultMessage) {
Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-14 16:02:38 UTC (rev 7808)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-14 16:07:48 UTC (rev 7809)
@@ -79,7 +79,7 @@
if (this.selectedItem) {
//was created new item list, so necessary to recreate selectedItem
- this.doSelectItem(this.findItemBySubstr(this.selectedItem.innerHTML));
+ this.doSelectItem(this.findItemBySubstr(this.selectedItem.innerHTML.unescapeHTML()));
}
if (this.selectFirstOnUpdate) {
@@ -355,7 +355,7 @@
var items = this.getItems();
for (var i = 0; i < items.length; i++) {
var item = items[i]
- var itText = item.innerHTML;
+ var itText = item.innerHTML.unescapeHTML();
if (itText.substr(0, substr.length).toLowerCase() == substr.toLowerCase()) { //FIXME: to optimaize
return item;
}
Modified: trunk/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-04-14 16:02:38 UTC (rev 7808)
+++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-04-14 16:07:48 UTC (rev 7809)
@@ -89,9 +89,12 @@
value = getConvertedStringValue(context, component,value);
if ("".equals(value)) {
valueStyle = "rich-combobox-font-disabled";
- value = defaultLabel;
+ value = defaultLabel;
}
variables.setVariable("value", value);
+ String convertedValue = encodeValue((String)value);
+ variables.setVariable("convertedValue", convertedValue);
+
variables.setVariable("valueStyle", valueStyle);
Object inputStyle = component.getAttributes().get("inputStyle");
@@ -209,8 +212,8 @@
name="#{clientId}comboboxField"
disabled="#{disabled}"
class="#{valueStyle} rich-combobox-input-inactive #{inputDisabledClass}" type="text"
+ readonly="#{enableManualInput}"
value="#{value}"
- readonly="#{enableManualInput}"
onblur="#{component.attributes['onblur']}"
style="width:#{correction}; #{inputStyle}"
autocomplete="off"
@@ -315,7 +318,7 @@
#{this:getAsEventHandler(context, component, "onlistcall")},
#{this:getAsEventHandler(context, component, "onselect")},
"#{defaultLabel}",
- #{disabled}, "#{value}",
+ #{disabled}, #{convertedValue},
#{component.attributes["showDelay"]}, #{component.attributes["hideDelay"]});
</script>
</div>
16 years, 9 months
JBoss Rich Faces SVN: r7808 - branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-04-14 12:02:38 -0400 (Mon, 14 Apr 2008)
New Revision: 7808
Modified:
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
Log:
fix selection
Modified: branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
===================================================================
--- branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-14 15:52:43 UTC (rev 7807)
+++ branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-14 16:02:38 UTC (rev 7808)
@@ -79,7 +79,7 @@
if (this.selectedItem) {
//was created new item list, so necessary to recreate selectedItem
- this.doSelectItem(this.findItemBySubstr(this.selectedItem.innerHTML));
+ this.doSelectItem(this.findItemBySubstr(this.selectedItem.innerHTML.unescapeHTML()));
}
if (this.selectFirstOnUpdate) {
16 years, 9 months
JBoss Rich Faces SVN: r7807 - in trunk/docs: migrationguide and 9 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-04-14 11:52:43 -0400 (Mon, 14 Apr 2008)
New Revision: 7807
Added:
trunk/docs/migrationguide/
trunk/docs/migrationguide/en/
trunk/docs/migrationguide/en/pom.xml
trunk/docs/migrationguide/en/src/
trunk/docs/migrationguide/en/src/main/
trunk/docs/migrationguide/en/src/main/docbook/
trunk/docs/migrationguide/en/src/main/docbook/master.xml
trunk/docs/migrationguide/en/src/main/docbook/modules/
trunk/docs/migrationguide/en/src/main/docbook/modules/intro.xml
trunk/docs/migrationguide/en/src/main/resources/
trunk/docs/migrationguide/en/src/main/resources/css/
trunk/docs/migrationguide/en/src/main/resources/css/html.css
trunk/docs/migrationguide/en/src/main/resources/images/
trunk/docs/migrationguide/en/src/main/resources/images/bg_table.gif
trunk/docs/migrationguide/en/src/main/resources/images/ico_important.gif
trunk/docs/migrationguide/en/src/main/resources/images/ico_note.gif
trunk/docs/migrationguide/en/src/main/resources/images/ico_tip.gif
trunk/docs/migrationguide/en/src/main/resources/script/
trunk/docs/migrationguide/en/src/main/resources/script/toggle.js
trunk/docs/migrationguide/pom.xml
Log:
http://jira.jboss.com/jira/browse/RF-3048 - Folder structure and pom.xml files were added
Added: trunk/docs/migrationguide/en/pom.xml
===================================================================
--- trunk/docs/migrationguide/en/pom.xml (rev 0)
+++ trunk/docs/migrationguide/en/pom.xml 2008-04-14 15:52:43 UTC (rev 7807)
@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>migration</artifactId>
+ <version>3.2.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.richfaces.docs.migration</groupId>
+ <artifactId>${translation}</artifactId>
+ <version>3.2.1-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>RichFaces Migration Guide (${translation})</name>
+
+ <properties>
+ <translation>en</translation>
+ </properties>
+ <build>
+ <finalName>
+ ${project.parent.artifactId}_${translation}-${version}
+ </finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/docs/migrationguide/en/src/main/docbook/master.xml
===================================================================
--- trunk/docs/migrationguide/en/src/main/docbook/master.xml (rev 0)
+++ trunk/docs/migrationguide/en/src/main/docbook/master.xml 2008-04-14 15:52:43 UTC (rev 7807)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd" [
+ <!ENTITY intro SYSTEM "modules/intro.xml">
+]>
+<book>
+ <bookinfo>
+ <title>RichFaces Migration Guide</title>
+ <copyright>
+ <year>2008</year>
+ <holder>Red Hat</holder>
+ </copyright>
+ </bookinfo>
+ <toc/>
+
+ &intro;
+
+
+
+</book>
Added: trunk/docs/migrationguide/en/src/main/docbook/modules/intro.xml
===================================================================
--- trunk/docs/migrationguide/en/src/main/docbook/modules/intro.xml (rev 0)
+++ trunk/docs/migrationguide/en/src/main/docbook/modules/intro.xml 2008-04-14 15:52:43 UTC (rev 7807)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="Introduction" xreflabel="Introduction">
+ <?dbhtml filename="intro.html"?>
+ <chapterinfo>
+ <keywordset>
+ <keyword>RichFaces</keyword>
+ <keyword>Migration Guide</keyword>
+ </keywordset>
+ </chapterinfo>
+
+ <title>Introduction</title>
+
+</chapter>
\ No newline at end of file
Added: trunk/docs/migrationguide/en/src/main/resources/css/html.css
===================================================================
--- trunk/docs/migrationguide/en/src/main/resources/css/html.css (rev 0)
+++ trunk/docs/migrationguide/en/src/main/resources/css/html.css 2008-04-14 15:52:43 UTC (rev 7807)
@@ -0,0 +1,409 @@
+* {
+ LINE-HEIGHT: 20px; FONT-FAMILY: verdana, helvetica, sans-serif
+}
+DIV.navheader TABLE, DIV.navheader TABLE td, DIV.navfooter TABLE, DIV.navfooter TABLE td{
+ BORDER-RIGHT: 0px; BORDER-TOP: 0px; MARGIN: 0px; BORDER-LEFT: 0px; BORDER-BOTTOM: 0px; FONT-SIZE: 11px; padding : 0px;
+}
+A {
+ COLOR: #2a7bd4; FONT-FAMILY: verdana, helvetica, sans-serif
+}
+A:hover {
+ COLOR: #003399; FONT-FAMILY: verdana, helvetica, sans-serif
+}
+A:visited {
+ COLOR: #888888; FONT-FAMILY: verdana, helvetica, sans-serif
+}
+P {
+ FONT-SIZE: 12px; COLOR: #000000; margin : 5px 0px 5px 0px;
+}
+OL {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+UL {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+LI {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+DL {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+DT {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+DD {
+ FONT-SIZE: 12px; COLOR: #000000; margin-top : 5px; margin-bottom : 5px;
+}
+BLOCKQUOTE {
+ FONT-SIZE: 12px; COLOR: #000000
+}
+TD {
+ COLOR: #000000
+}
+TH {
+ COLOR: #000000
+}
+SPAN {
+ COLOR: #000000
+}
+SPAN.property {
+ COLOR: #008cca;
+}
+SPAN.italic {
+ FONT-STYLE: italic;
+}
+
+BLOCKQUOTE {
+ MARGIN-RIGHT: 0px
+}
+
+P.title {
+ MARGIN-BOTTOM: 5px;
+ MARGIN-top: 20px;
+}
+
+div.book div.chapter .title {
+ text-align: left;
+}
+
+
+div.book .title {
+ text-align: center;
+}
+
+div.book .subtitle {
+ text-align: center;
+}
+
+.mediaobject{
+ padding : 5px 10px 5px 35px;
+}
+H1 {
+ MARGIN: 0px; FONT-SIZE: 22px; COLOR: #ff6600; PADDING: 45px 0px 10px 0px;
+}
+H2 {
+ MARGIN: 0px; FONT-SIZE: 18px; COLOR: #2a7bd4; PADDING: 25px 0px 10px 0px;
+}
+H3 {
+ MARGIN: 0px; FONT-SIZE: 15px; COLOR: #000000; PADDING: 20px 0px 10px 0px;
+}
+H4 {
+ MARGIN: 0px; FONT-SIZE: 12px; COLOR: #000000; PADDING: 15px 0px 10px 0px;
+}
+H5 {
+ MARGIN: 0px; FONT-SIZE: 12px; COLOR: #000000; PADDING: 15px 0px 10px 0px;
+}
+H6 {
+ MARGIN: 0px; FONT-SIZE: 11px; COLOR: #000000; PADDING: 5px 0px 0px 0px;
+}
+
+div.book div.section div.mediaobject{
+text-align:left;
+}
+
+
+div.book div.mediaobject{
+text-align:center;
+}
+
+div.mediaobject, div.mediaobject img *{
+text-align:left;
+
+}
+
+DIV.note{
+ BORDER: #CECECE 1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px; MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #FFFDD3;
+ background-image : url('../images/ico_note.gif'); background-repeat : no-repeat; background-position :top left;
+}
+
+DIV.note *{
+ line-height : 14px;
+}
+
+.note P {
+ MARGIN-TOP: 0px; MARGIN-BOTTOM: 1em; PADDING-BOTTOM: 0px; PADDING-TOP: 0px
+}
+.important P {
+ MARGIN-TOP: 0px; MARGIN-BOTTOM: 1em; PADDING-BOTTOM: 0px; PADDING-TOP: 0px
+}
+DIV.important {
+ BORDER: #CECECE 1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px; MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #fee3d9;
+ background-image : url('../images/ico_important.gif'); background-repeat : no-repeat; background-position :top left;
+}
+
+DIV.important *{
+ line-height : 14px;
+}
+
+.important pre.XML {
+PADDING: 1px 1px 1px 10px;
+
+}
+
+DIV.tip {
+ BORDER: #CECECE 1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px; MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #CFE3FF; background-repeat : no-repeat; background-position :top left; background-image : url('../images/ico_tip.gif');
+}
+
+DIV.tip *{
+ line-height : 14px;
+}
+
+.tip pre.XML {
+PADDING: 1px 1px 1px 10px;
+
+}
+
+TABLE {
+ BORDER: #cccccc 1px solid; FONT-SIZE: 11px; BORDER-COLLAPSE: collapse; border-spacing: 0; empty-cells: hide; margin-bottom : 10px;
+}
+
+table *{
+ line-height : 14px;
+}
+
+
+.table TH {
+ WHITE-SPACE: nowrap; BACKGROUND-COLOR: #EEF5FF; TEXT-ALIGN: center; BORDER-BOTTOM: #CAE1FF 2px solid; PADDING: 2px 8px 2px 8px;
+ background-image : url('../images/bg_table.gif'); background-repeat : repeat-x; background-position :top left;
+}
+TD {
+ PADDING: 4px 8px 4px 8px; BORDER-BOTTOM: #cccccc 1px dotted; BORDER-right: #cccccc 1px dotted;
+}
+P.copyright {
+ TEXT-ALIGN: center
+}
+TT {
+ FONT-SIZE: 90%; COLOR: #000000; FONT-FAMILY: "Courier New", Courier, monospace
+}
+DL {
+ MARGIN-BOTTOM: 6px; MARGIN-LEFT: 8px
+}
+DT {
+ MARGIN-BOTTOM: 6px; MARGIN-LEFT: 8px
+}
+DD {
+ MARGIN-BOTTOM: 6px; MARGIN-LEFT: 8px
+}
+PRE {
+ BORDER: #cccccc 1px solid; PADDING: 5px 15px 5px 25px; FONT-SIZE: 11px; BACKGROUND-COLOR: #f5f5f5;
+}
+HR {
+ BORDER-TOP-WIDTH: 0px; PADDING-RIGHT: 0px; PADDING-LEFT: 0px; BORDER-LEFT-WIDTH: 0px; BORDER-BOTTOM-WIDTH: 0px; PADDING-BOTTOM: 0px; WIDTH: 100%; COLOR: #cccccc; PADDING-TOP: 0px; HEIGHT: 1px; BACKGROUND-COLOR: #cccccc; BORDER-RIGHT-WIDTH: 0px
+}
+.variablelist {
+ PADDING-BOTTOM: 10px; MARGIN: 0px; PADDING-TOP: 10px
+}
+.itemizedlist {
+ FONT-SIZE: 12px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px;TEXT-ALIGN: justify
+}
+.term {
+ FONT-WEIGHT: bold
+}
+PRE.JAVA {
+ LINE-HEIGHT: 0px
+}
+PRE.XML {
+ LINE-HEIGHT: 0px
+}
+PRE.JSP {
+ LINE-HEIGHT: 0px
+}
+PRE.XHTML {
+ LINE-HEIGHT: 0px
+}
+.java_type {
+ COLOR: #008cca
+}
+.java_keyword {
+ FONT-WEIGHT: bold; COLOR: rgb(0,0,0)
+}
+.java_javadoc_comment {
+ COLOR: rgb(147,147,147); FONT-STYLE: italic; BACKGROUND-COLOR: rgb(247,247,247)
+}
+.java_comment {
+ COLOR: rgb(147,147,147); BACKGROUND-COLOR: rgb(247,247,247)
+}
+.java_operator {
+ COLOR: #003399
+}
+.java_plain {
+ COLOR: rgb(0,0,0)
+}
+.java_literal {
+ COLOR: #ff6600
+}
+PRE CODE {
+ FONT-SIZE: 12px; COLOR: rgb(0,0,0); FONT-FAMILY: monospace; WHITE-SPACE: nowrap
+}
+.java_javadoc_tag {
+ FONT-WEIGHT: bold; COLOR: rgb(147,147,147); FONT-STYLE: italic; BACKGROUND-COLOR: rgb(247,247,247)
+}
+.java_separator {
+ COLOR: #008cca
+}
+.xml_plain {
+ COLOR: rgb(0,0,0)
+}
+.xml_tag_name {
+ COLOR: #008cca
+}
+.xml_comment {
+ COLOR: rgb(147,147,147); BACKGROUND-COLOR: rgb(247,247,247)
+}
+.xml_tag_symbols {
+ COLOR: #008cca
+}
+.xml_rife_tag {
+ COLOR: rgb(0,0,0); BACKGROUND-COLOR: rgb(228,230,160)
+}
+.xml_attribute_value {
+ COLOR: #ff6600
+}
+.xml_attribute_name {
+ FONT-WEIGHT: bold; COLOR: rgb(0,0,0)
+}
+.xml_char_data {
+ COLOR: rgb(0,0,0)
+}
+.xml_rife_name {
+ COLOR: #008cca; BACKGROUND-COLOR: rgb(228,230,160)
+}
+.xml_processing_instruction {
+ FONT-WEIGHT: bold; COLOR: rgb(0,0,0); FONT-STYLE: italic
+}
+TD.java {
+ VERTICAL-ALIGN: top; LINE-HEIGHT: 10px
+}
+TD.java-ln {
+ VERTICAL-ALIGN: top; LINE-HEIGHT: 10px
+}
+TT.java {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+TT.java-ln {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+PRE.java {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+PRE.java-ln {
+ MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+TD.java-ln {
+ LINE-HEIGHT: 10px; TEXT-ALIGN: right
+}
+TT.java-ln {
+ COLOR: #888888; LINE-HEIGHT: 10px
+}
+PRE.java-ln {
+ COLOR: #888888; LINE-HEIGHT: 10px
+}
+SPAN.java0 {
+ FONT-SIZE: 8pt; COLOR: #ffffff; LINE-HEIGHT: 10px
+}
+SPAN.java1 {
+ FONT-SIZE: 8pt; COLOR: #808080
+}
+SPAN.java2 {
+ FONT-SIZE: 8pt; COLOR: #3f7f5f; LINE-HEIGHT: 10px
+}
+SPAN.java3 {
+ FONT-SIZE: 8pt; COLOR: #3f7f5f; LINE-HEIGHT: 10px
+}
+SPAN.java4 {
+ FONT-WEIGHT: bold; FONT-SIZE: 8pt; COLOR: #ff6600; LINE-HEIGHT: 10px
+}
+SPAN.java5 {
+ FONT-SIZE: 8pt; COLOR: #2a00ff; LINE-HEIGHT: 10px
+}
+SPAN.java6 {
+ FONT-SIZE: 8pt; COLOR: #990000; LINE-HEIGHT: 10px
+}
+SPAN.java7 {
+ FONT-SIZE: 8pt; COLOR: #990000; LINE-HEIGHT: 10px
+}
+SPAN.java8 {
+ FONT-SIZE: 8pt; COLOR: #000000; LINE-HEIGHT: 10px
+}
+SPAN.java9 {
+ FONT-WEIGHT: bold; FONT-SIZE: 8pt; COLOR: #ff6600; LINE-HEIGHT: 10px
+}
+SPAN.java10 {
+ FONT-SIZE: 8pt; COLOR: #000000; LINE-HEIGHT: 10px
+}
+SPAN.java11 {
+ FONT-SIZE: 8pt; COLOR: #7f9fbf; LINE-HEIGHT: 10px
+}
+SPAN.java12 {
+ FONT-SIZE: 8pt; COLOR: #7f7f9f; LINE-HEIGHT: 10px
+}
+SPAN.java13 {
+ FONT-SIZE: 8pt; COLOR: #3f3fbf; LINE-HEIGHT: 10px
+}
+SPAN.java14 {
+ FONT-SIZE: 8pt; COLOR: #3f5fbf; LINE-HEIGHT: 10px
+}
+SPAN.java15 {
+ FONT-SIZE: 8pt; COLOR: #ff6100; LINE-HEIGHT: 10px
+}
+SPAN.java16 {
+ FONT-SIZE: 8pt; COLOR: #646464; LINE-HEIGHT: 10px
+}
+
+.expand_collapse_toc {
+ clear:both;
+ float:left;
+ font-family:monospace;
+ width:20px;
+ color: #2A7BD4;
+ cursor: pointer;
+}
+
+pre.CSS, pre.css {
+ line-height:0px;
+ margin-bottom:0em;
+}
+.css_normal {
+ line-height:0px;
+ color:#000000;
+}
+.css_colon {
+color:#000000;
+}
+.css_semi_colon {
+color:#000000;
+}
+.css_curly_brace {
+color:#000000;
+}
+.css_comment {
+color:#939393;
+}
+.css_error {
+color:#BF3F3F;
+}
+.css_selector {
+color:#008cca;
+}
+.css_null {
+color:#008cca;
+}
+.css_property_name {
+color:#000000;
+font-weight:bold;
+}
+.css_property_value {
+color:#ff6600;
+}
+.css_uri {
+color:#2A00FF;
+}
+.css_atmark_rule {
+color:#3F7F7F;
+}
+.css_media {
+color:#336699;
+}
+.css_string {
+color:#336699;
+}
\ No newline at end of file
Added: trunk/docs/migrationguide/en/src/main/resources/images/bg_table.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/migrationguide/en/src/main/resources/images/bg_table.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/migrationguide/en/src/main/resources/images/ico_important.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/migrationguide/en/src/main/resources/images/ico_important.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/migrationguide/en/src/main/resources/images/ico_note.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/migrationguide/en/src/main/resources/images/ico_note.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/migrationguide/en/src/main/resources/images/ico_tip.gif
===================================================================
(Binary files differ)
Property changes on: trunk/docs/migrationguide/en/src/main/resources/images/ico_tip.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/docs/migrationguide/en/src/main/resources/script/toggle.js
===================================================================
--- trunk/docs/migrationguide/en/src/main/resources/script/toggle.js (rev 0)
+++ trunk/docs/migrationguide/en/src/main/resources/script/toggle.js 2008-04-14 15:52:43 UTC (rev 7807)
@@ -0,0 +1,43 @@
+function dbToggle(node, expandText, collapseText) {
+ var dt = node.parentNode;
+ if (dt.nodeName.toLowerCase() == 'dt') {
+ var dd = dt.nextSibling;
+
+ if (dd && dd.nodeName.toLowerCase() == 'dd') {
+
+ if (dd.style && dd.style.display == 'none') {
+ dd.style.display = '';
+ node.innerHTML = collapseText;
+ } else {
+ dd.style.display = 'none';
+ node.innerHTML = expandText;
+ }
+
+ }
+
+ }
+
+}
+
+var toc = {
+ expand: function(node) {
+ toc.show(toc.findDD(node))
+ toc.hide(node);
+ toc.show(node.nextSibling);
+ },
+ collapse : function(node) {
+ toc.hide(toc.findDD(node))
+ toc.hide(node);
+ toc.show(node.previousSibling);
+ },
+ findDD : function(node) {
+ return node.parentNode.nextSibling;
+ },
+
+ hide: function(node) {
+ node.style.display = "none";
+ },
+ show: function(node) {
+ node.style.display = "";
+ }
+};
\ No newline at end of file
Added: trunk/docs/migrationguide/pom.xml
===================================================================
--- trunk/docs/migrationguide/pom.xml (rev 0)
+++ trunk/docs/migrationguide/pom.xml 2008-04-14 15:52:43 UTC (rev 7807)
@@ -0,0 +1,103 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>docs</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.2.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.docs</groupId>
+ <artifactId>migration</artifactId>
+ <packaging>pom</packaging>
+ <version>3.2.1-SNAPSHOT</version>
+ <name>Migration Guide</name>
+ <description>RichFaces Migration Guide from 3.1.* to 3.2.0 version</description>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <id>repository.jboss.com</id>
+ <name>Jboss Repository for Maven</name>
+ <url>http://repository.jboss.com/maven2/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.0.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.docs.xslt</groupId>
+ <artifactId>${translation}</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDirectory> ${basedir}/src/main/docbook </sourceDirectory>
+ <imageResource>
+ <directory> ${basedir}/src/main/resources </directory>
+ </imageResource>
+ <cssResource>
+ <directory> ${basedir}/src/main/resources </directory>
+ </cssResource>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>/xslt/fopdf.xsl</stylesheetResource>
+ <finalName>RF_migration_guide.pdf</finalName>
+ <imagePathSettingRequired>true</imagePathSettingRequired>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>
+ /xslt/html_chunk.xsl
+ </stylesheetResource>
+ <finalName>index.html</finalName>
+ <imageCopyingRequired>
+ true
+ </imageCopyingRequired>
+ <imagePathSettingRequired>
+ false
+ </imagePathSettingRequired>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>/xslt/html.xsl</stylesheetResource>
+ <imageCopyingRequired>true</imageCopyingRequired>
+ <imagePathSettingRequired>false</imagePathSettingRequired>
+ <finalName>RF_migration_guide.html </finalName>
+ </format>
+ </formats>
+ <xincludeSupported>true</xincludeSupported>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <useRelativeImageUris> true </useRelativeImageUris>
+ <xmlTransformerType> saxon </xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <properties>
+ <masterTranslation>en</masterTranslation>
+ </properties>
+
+ <modules>
+ <module>en</module>
+ </modules>
+
+</project>
16 years, 9 months
JBoss Rich Faces SVN: r7806 - in branches/3.2.x/ui/inplaceSelect/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-04-14 10:56:06 -0400 (Mon, 14 Apr 2008)
New Revision: 7806
Modified:
branches/3.2.x/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
branches/3.2.x/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
Log:
http://jira.jboss.com/jira/browse/RF-3058, http://jira.jboss.com/jira/browse/RF-3059,
Modified: branches/3.2.x/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- branches/3.2.x/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-04-14 14:46:43 UTC (rev 7805)
+++ branches/3.2.x/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-04-14 14:56:06 UTC (rev 7806)
@@ -189,7 +189,7 @@
applyTmpValue : function() {
if (this.comboList.activeItem) {
- var userLabel = this.comboList.activeItem.innerHTML;
+ var userLabel = this.comboList.activeItem.innerHTML.unescapeHTML();
this.currentItemValue = this.comboList.activeItem.value;
this.tempValueKeeper.value = userLabel;
this.comboList.selectedItem = this.comboList.activeItem;
@@ -223,7 +223,7 @@
if (item) {
this.comboList.doSelectItem(item);
- $super(e, item.innerHTML);
+ $super(e, item.innerHTML.unescapeHTML());
} else {
$super(e, "");
}
Modified: branches/3.2.x/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
===================================================================
--- branches/3.2.x/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-14 14:46:43 UTC (rev 7805)
+++ branches/3.2.x/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-04-14 14:56:06 UTC (rev 7806)
@@ -36,13 +36,18 @@
}
String fieldLabel = getSelectedItemLabel(context, component);
value = getConvertedStringValue(context, component,value);
- Object fieldValue = value;
+ String fieldValue = (String)value;
if (value == null || value.equals("")) {
fieldValue = "";
}
+
+
+ String encodedFieldValue = encodeValue(fieldValue);
+
variables.setVariable("fieldLabel", fieldLabel);
variables.setVariable("fieldValue", fieldValue);
+ variables.setVariable("encodedFieldValue", encodedFieldValue);
/*String saveIcon = (String)component.getAttributes().get("saveControlIcon");
if (saveIcon != null && saveIcon.length() != 0 ) {
@@ -183,7 +188,7 @@
new Richfaces.InplaceSelect(new Richfaces.InplaceSelectList('list#{clientId}', 'listParent#{clientId}', true,
Richfaces.InplaceSelect.CLASSES.COMBO_LIST, '#{component.attributes["listWidth"]}', '#{component.attributes["listHeight"]}', #{this:getItemsTextAsJSArray(context, component,items)}, null,
- '#{clientId}inplaceTmpValue', 'shadow#{clientId}', 0, 0, '#{fieldValue}'),
+ '#{clientId}inplaceTmpValue', 'shadow#{clientId}', 0, 0, #{encodedFieldValue}),
'#{clientId}', '#{clientId}inplaceTmpValue',
'#{clientId}inplaceValue', '#{clientId}tabber',
{defaultLabel : '#{component.attributes["defaultLabel"]}',
16 years, 9 months
JBoss Rich Faces SVN: r7805 - in branches/3.2.x/ui/combobox/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-04-14 10:46:43 -0400 (Mon, 14 Apr 2008)
New Revision: 7805
Modified:
branches/3.2.x/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
branches/3.2.x/ui/combobox/src/main/templates/combobox.jspx
Log:
http://jira.jboss.com/jira/browse/RF-3058
Modified: branches/3.2.x/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- branches/3.2.x/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-04-14 14:28:47 UTC (rev 7804)
+++ branches/3.2.x/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2008-04-14 14:46:43 UTC (rev 7805)
@@ -157,4 +157,8 @@
return ScriptUtils.toScript(result);
}
+
+public String encodeValue(String value){
+ return ScriptUtils.toScript(value);
+ }
}
Modified: branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
===================================================================
--- branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-14 14:28:47 UTC (rev 7804)
+++ branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-14 14:46:43 UTC (rev 7805)
@@ -348,7 +348,7 @@
var items = this.getItems();
for (var i = 0; i < items.length; i++) {
var item = items[i]
- var itText = item.innerHTML;
+ var itText = item.innerHTML.unescapeHTML();
if (itText.substr(0, substr.length).toLowerCase() == substr.toLowerCase()) { //FIXME: to optimaize
return item;
}
Modified: branches/3.2.x/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- branches/3.2.x/ui/combobox/src/main/templates/combobox.jspx 2008-04-14 14:28:47 UTC (rev 7804)
+++ branches/3.2.x/ui/combobox/src/main/templates/combobox.jspx 2008-04-14 14:46:43 UTC (rev 7805)
@@ -92,6 +92,9 @@
value = defaultLabel;
}
variables.setVariable("value", value);
+ String convertedValue = encodeValue((String)value);
+ variables.setVariable("convertedValue", convertedValue);
+
variables.setVariable("valueStyle", valueStyle);
Object inputStyle = component.getAttributes().get("inputStyle");
@@ -315,7 +318,7 @@
#{this:getAsEventHandler(context, component, "onlistcall")},
#{this:getAsEventHandler(context, component, "onselect")},
"#{defaultLabel}",
- #{disabled}, "#{value}",
+ #{disabled}, #{convertedValue},
#{component.attributes["showDelay"]}, #{component.attributes["hideDelay"]});
</script>
</div>
16 years, 9 months
JBoss Rich Faces SVN: r7803 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-04-14 10:27:25 -0400 (Mon, 14 Apr 2008)
New Revision: 7803
Modified:
trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
Log:
http://jira.jboss.com/jira/browse/RF-2979
fixed
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2008-04-14 14:20:15 UTC (rev 7802)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml 2008-04-14 14:27:25 UTC (rev 7803)
@@ -460,19 +460,8 @@
</thead>
<tbody>
+
<row>
- <entry>rich-pmenu-top-group-div</entry>
-
- <entry>Defines styles for a wrapper <div> element of a top group</entry>
- </row>
-
- <row>
- <entry>rich-pmenu-top-group</entry>
-
- <entry>Defines styles for a top group</entry>
- </row>
-
- <row>
<entry>rich-pmenu-top-group-self-icon</entry>
<entry>Defines styles for a top group icon</entry>
@@ -500,11 +489,6 @@
</thead>
<tbody>
- <row>
- <entry>rich-pmenu-group-div</entry>
-
- <entry>Defines styles for a wrapper <div> element of a group</entry>
- </row>
<row>
<entry>rich-pmenu-group</entry>
16 years, 9 months
JBoss Rich Faces SVN: r7802 - trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxCommands.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-04-14 10:20:15 -0400 (Mon, 14 Apr 2008)
New Revision: 7802
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxCommands/ajaxButtonDescription.xhtml
trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxCommands/ajaxButtonTest.xhtml
Log:
Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxCommands/ajaxButtonDescription.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxCommands/ajaxButtonDescription.xhtml 2008-04-14 14:03:47 UTC (rev 7801)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxCommands/ajaxButtonDescription.xhtml 2008-04-14 14:20:15 UTC (rev 7802)
@@ -1,3 +1,13 @@
<html>
-askgfjas faskjfaskl klj
+<table border="1" style="border-color: #F1EEE9" cellpadding="5" cellspacing="0">
+<tr><th></th><th>Action</th><th>Result</th></tr>
+<tr><td>1</td><td>Click 1st button</td><td>Input value == 3</td></tr>
+<tr><td>2</td><td>Click 1st button</td><td>Input value == 6</td></tr>
+<tr><td>3</td><td>Click 2nd button</td><td>Input value == 6</td></tr>
+<tr><td>4</td><td>Click 3td button</td><td>Input value == 6</td></tr>
+<tr><td>5</td><td>Click 4th button</td><td>Input value == 1</td></tr>
+<tr><td>6</td><td>Click 5th button</td><td>Input value == 2</td></tr>
+<tr><td>7</td><td>Click 1st button</td><td>Input value == 5</td></tr>
+<tr><td>8</td><td>Click 3th button</td><td>Input value == 5</td></tr>
+</table>
</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxCommands/ajaxButtonTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxCommands/ajaxButtonTest.xhtml 2008-04-14 14:03:47 UTC (rev 7801)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/ajaxCommands/ajaxButtonTest.xhtml 2008-04-14 14:20:15 UTC (rev 7802)
@@ -54,7 +54,6 @@
<br/>
<h:inputText value="#{commandBean.value}" id="_value"></h:inputText>
<br/>
- <rich:calendar></rich:calendar>
</ui:define>
<ui:define name="description">
<ui:include src="ajaxButtonDescription.xhtml" />
16 years, 9 months
JBoss Rich Faces SVN: r7801 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-04-14 10:03:47 -0400 (Mon, 14 Apr 2008)
New Revision: 7801
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java
Log:
Remove throwing of exception
Modified: trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java 2008-04-14 13:53:40 UTC (rev 7800)
+++ trunk/framework/api/src/main/java/org/richfaces/model/UploadItem.java 2008-04-14 14:03:47 UTC (rev 7801)
@@ -62,23 +62,21 @@
}
/**
+ * This method should called only in case of TRUE value returned by {@link #isFile()} method.
+ * Otherwise null value will be returned by this method.
* @return the file
*/
public File getFile() throws Exception {
- if (!isFile()) {
- throw new FacesException("This method should be called only if Ajax4Jsf filter's parameter 'createTempFiles' set up in TRUE value");
- }
return file;
}
/**
+ * This method should called only in case of FALSE value returned by {@link #isFile()} method.
+ * Otherwise null value will be returned by this method.
* @return the bytes
* @throws Exception
*/
public byte[] getData() throws Exception {
- if (isFile()) {
- throw new FacesException("This method should be called only if Ajax4Jsf filter's parameter 'createTempFiles' set up in FALSE value");
- }
return bytes;
}
16 years, 9 months