JBoss Rich Faces SVN: r6418 - trunk/ui/dataTable/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2008-02-28 10:56:07 -0500 (Thu, 28 Feb 2008)
New Revision: 6418
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
filterEvent attribute added to column.
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-28 15:55:41 UTC (rev 6417)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-28 15:56:07 UTC (rev 6418)
@@ -500,6 +500,9 @@
String onkeydownEvent = inplaceInput ? "oninputkeydown" : HTML.onkeydown_ATTRIBUTE;
String filterEvent = (String) column.getAttributes().get("filterEvent");
+ if (null == filterEvent || "".equals(filterEvent)) {
+ filterEvent = "onchange";
+ }
filterValueInput.getAttributes().put(filterEvent, buffer.toString());
filterValueInput.getAttributes().put(onkeydownEvent, "RichFaces.blurFilterInput(event);");
filterValueInput.setValue(column.getAttributes().get("filterValue"));
16 years, 10 months
JBoss Rich Faces SVN: r6417 - in trunk/sandbox/ui/inplaceSelect/src/main: templates and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-02-28 10:55:41 -0500 (Thu, 28 Feb 2008)
New Revision: 6417
Modified:
trunk/sandbox/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
Log:
add encoding of the controls facet
Modified: trunk/sandbox/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-02-28 15:54:54 UTC (rev 6416)
+++ trunk/sandbox/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-02-28 15:55:41 UTC (rev 6417)
@@ -30,7 +30,9 @@
private static Log logger = LogFactory.getLog(InplaceSelectBaseRenderer.class);
private static final String RICH_INPLACE_SELECT_CLASSES = "rich-inplace-select-item rich-inplace-select-font";
+ private static final String CONTROLS_FACET = "controls";
+
@Override
protected void doDecode(FacesContext context, UIComponent component) {
UIInplaceSelect inplaceInput = null;
@@ -93,6 +95,22 @@
setValuesList(values);
}
+ public void encodeControlsFacet(FacesContext context, UIComponent component) throws IOException {
+ UIComponent facet = component.getFacet(CONTROLS_FACET);
+ if ((facet != null) && (facet.isRendered())) {
+ renderChild(context, facet);
+ }
+ }
+
+ public boolean isControlsFacetExists(FacesContext context, UIComponent component) {
+ UIComponent facet = component.getFacet(CONTROLS_FACET);
+ if (facet != null && facet.isRendered()) {
+ return true;
+ }
+ return false;
+ }
+
+
@Override
protected String getConvertedStringValue(FacesContext context, UIComponent component, Object value) {
UIInplaceSelect select = null;
Modified: trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
===================================================================
--- trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-02-28 15:54:54 UTC (rev 6416)
+++ trunk/sandbox/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2008-02-28 15:55:41 UTC (rev 6417)
@@ -76,6 +76,13 @@
class="rich-inplace-select-field"/>
<input id='#{clientId}inplaceValue' name='#{clientId}inplaceValue' type='hidden' value='#{fieldValue}'/>
<div id="#{clientId}bar" class="rich-inplace-select-control-set" style="display:none;">
+ <jsp:scriptlet>
+ <![CDATA[
+ if (isControlsFacetExists(context, component)) {
+ encodeControlsFacet(context, component);
+ } else {
+ ]]>
+ </jsp:scriptlet>
<div class="rich-inplace-select-shadow" id="#{clientId}btns_shadow">
<table cellpadding="0" cellspacing="0" border="0" class="rich-inplace-select-shadow-size">
<tr>
@@ -100,6 +107,11 @@
<input id="#{clientId}ok" type="image" src="#{saveIcon}" class="rich-inplace-select-control" onmousedown="this.className='rich-inplace-select-control-press'" onmouseout="this.className='rich-inplace-select-control'" onmouseup="this.className='rich-inplace-select-control'"/>
<input id="#{clientId}cancel" type="image" src="#{cancelIcon}" class="rich-inplace-select-control" onmousedown="this.className='rich-inplace-select-control-press'" onmouseout="this.className='rich-inplace-select-control'" onmouseup="this.className='rich-inplace-select-control'"/>
</div>
+ <jsp:scriptlet>
+ <![CDATA[
+ }
+ ]]>
+ </jsp:scriptlet>
</div>
<div id="listParent#{clientId}" class="rich-inplace-select-width-list" style="position : absolute; height : 100px; left : 0px; top: 13px">
16 years, 10 months
JBoss Rich Faces SVN: r6416 - in trunk/ui/dataTable/src/main: java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: sergeyhalipov
Date: 2008-02-28 10:54:54 -0500 (Thu, 28 Feb 2008)
New Revision: 6416
Modified:
trunk/ui/dataTable/src/main/config/component/column.xml
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
filterEvent attribute added to column.
Modified: trunk/ui/dataTable/src/main/config/component/column.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/column.xml 2008-02-28 15:54:08 UTC (rev 6415)
+++ trunk/ui/dataTable/src/main/config/component/column.xml 2008-02-28 15:54:54 UTC (rev 6416)
@@ -135,6 +135,13 @@
</description>
<defaultvalue>"default"</defaultvalue>
</property>
- -->
+ -->
+
+ <property>
+ <name>filterEvent</name>
+ <classname>java.lang.String</classname>
+ <description>Event for filter input that forces the filtration (default = onchange)</description>
+ <defaultvalue>"onchange"</defaultvalue>
+ </property>
</component>
</components>
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-28 15:54:08 UTC (rev 6415)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-28 15:54:54 UTC (rev 6416)
@@ -499,7 +499,8 @@
}
String onkeydownEvent = inplaceInput ? "oninputkeydown" : HTML.onkeydown_ATTRIBUTE;
- filterValueInput.getAttributes().put(HTML.onchange_ATTRIBUTE, buffer.toString());
+ String filterEvent = (String) column.getAttributes().get("filterEvent");
+ filterValueInput.getAttributes().put(filterEvent, buffer.toString());
filterValueInput.getAttributes().put(onkeydownEvent, "RichFaces.blurFilterInput(event);");
filterValueInput.setValue(column.getAttributes().get("filterValue"));
16 years, 10 months
JBoss Rich Faces SVN: r6415 - in trunk/sandbox/ui/inplaceInput/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-02-28 10:54:08 -0500 (Thu, 28 Feb 2008)
New Revision: 6415
Modified:
trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
add openOnEdit to the options, fix facet applying
Modified: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-28 15:15:17 UTC (rev 6414)
+++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-28 15:54:08 UTC (rev 6415)
@@ -120,10 +120,11 @@
options.addOption("editEvent");
options.addOption("selectOnEdit");
options.addOption("verticalPosition", component.getAttributes().get("controlsVerticalPosition"));
- options.addOption("horizontalPosition", component.getAttributes().get("controlsHorizontalPosition"));
+ options.addOption("horizontalPosition", component.getAttributes().get("controlsHorizontalPosition"));
options.addOption("inputWidth");
- options.addOption("minInputWidth");
- options.addOption("maxInputWidth");
+ options.addOption("inputMinWidth",component.getAttributes().get("minInputWidth"));
+ options.addOption("inputMaxWidth",component.getAttributes().get("maxInputWidth"));
+ options.addOption("openOnEdit");
attributes.append(options.toScript());
return attributes.toString();
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-28 15:15:17 UTC (rev 6414)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-28 15:54:08 UTC (rev 6415)
@@ -350,7 +350,9 @@
},
positioning : function(inpWidth, inpHeight) {
- this.bsPanel.style.height = inpHeight + "px";
+ if (this.bsPanel) {
+ this.bsPanel.style.height = inpHeight + "px";
+ }
this.bar.style.position = "absolute";
16 years, 10 months
JBoss Rich Faces SVN: r6414 - trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: vmolotkov
Date: 2008-02-28 10:15:17 -0500 (Thu, 28 Feb 2008)
New Revision: 6414
Modified:
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
inputWidth is corrected
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-28 14:58:37 UTC (rev 6413)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-28 15:15:17 UTC (rev 6414)
@@ -229,8 +229,8 @@
}
var width = parseInt(this.attributes.inputWidth);
if (!width) {
- var max = parseInt(this.attributes.inputMaxWidth);
- var min = parseInt(this.attributes.inputMinWidth);
+ var max = parseInt(this.attributes.maxInputWidth);
+ var min = parseInt(this.attributes.minInputWidth);
if (textSize > max) {
width = max;
} else if (textSize < min) {
16 years, 10 months
JBoss Rich Faces SVN: r6413 - Plan/3.2.0 and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: tkuprevich
Date: 2008-02-28 09:58:37 -0500 (Thu, 28 Feb 2008)
New Revision: 6413
Modified:
trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
Log:
Modified: trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
===================================================================
(Binary files differ)
16 years, 10 months
JBoss Rich Faces SVN: r6412 - Plan/3.2.0 and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: tkuprevich
Date: 2008-02-28 09:40:12 -0500 (Thu, 28 Feb 2008)
New Revision: 6412
Modified:
trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
Log:
Modified: trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
===================================================================
(Binary files differ)
16 years, 10 months
JBoss Rich Faces SVN: r6411 - management/design/standardComponent.
by richfaces-svn-commits@lists.jboss.org
Author: smukhina
Date: 2008-02-28 09:19:12 -0500 (Thu, 28 Feb 2008)
New Revision: 6411
Modified:
management/design/standardComponent/Func-Spec-StdControls.doc
management/design/standardComponent/Standard controls vision.doc
Log:
http://jira.jboss.com/jira/browse/RF-2138
Modified: management/design/standardComponent/Func-Spec-StdControls.doc
===================================================================
(Binary files differ)
Modified: management/design/standardComponent/Standard controls vision.doc
===================================================================
(Binary files differ)
16 years, 10 months
JBoss Rich Faces SVN: r6410 - in trunk/sandbox/ui/fileUpload/src/main: java/org/richfaces/org/jboss/seam/ui/renderkit and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: andrei_exadel
Date: 2008-02-28 09:07:57 -0500 (Thu, 28 Feb 2008)
New Revision: 6410
Modified:
trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
delete accept attr; fix;
Modified: trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-28 13:58:38 UTC (rev 6409)
+++ trunk/sandbox/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-02-28 14:07:57 UTC (rev 6410)
@@ -66,11 +66,6 @@
&html_input_attributes;
&html_events;
&html_input_events;
- <property transient="true">
- <name>accept</name>
- <classname>java.lang.String</classname>
- <description>a comma-separated list of content types to accept, may not be supported by the browser. E.g. "images/png,images/jpg", "images/*".</description>
- </property>
<property elonly="true">
<name>data</name>
<classname>java.lang.Object</classname>
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-28 13:58:38 UTC (rev 6409)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-28 14:07:57 UTC (rev 6410)
@@ -177,7 +177,7 @@
String acceptedTypes = (String)component.getAttributes().get("acceptedTypes");
if (acceptedTypes != null) {
Map<String, Boolean> accepted = new HashMap<String, Boolean>();
- String [] types = acceptedTypes.split("[,;]");
+ String [] types = acceptedTypes.split("[,;|]");
if (types != null) {
for (String type : types) {
accepted.put(type.toLowerCase(), true);
Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-28 13:58:38 UTC (rev 6409)
+++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-28 14:07:57 UTC (rev 6410)
@@ -400,6 +400,7 @@
this.options = options || {};
this.initEvents();
this.setupAutoUpload();
+ this.checkFrame();
},
createFrame: function () {
@@ -414,6 +415,12 @@
return iframe;
},
+ checkFrame: function () {
+ this.iframe = $(this.id + "_iframe");
+ if (this.iframe) {
+ this.deleteFrame();
+ }
+ },
deleteFrame: function() {
if (this.iframe) {
16 years, 10 months
JBoss Rich Faces SVN: r6409 - Plan/3.2.0 and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: tkuprevich
Date: 2008-02-28 08:58:38 -0500 (Thu, 28 Feb 2008)
New Revision: 6409
Modified:
trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
Log:
Modified: trunk/test-applications/qa/Test Plan/3.2.0/TestPlan-RF-3.2.0.doc
===================================================================
(Binary files differ)
16 years, 10 months