JBoss Rich Faces SVN: r6908 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: cluts
Date: 2008-03-18 10:40:26 -0400 (Tue, 18 Mar 2008)
New Revision: 6908
Added:
trunk/docs/userguide/en/src/main/resources/images/columnsort3.png
Modified:
trunk/docs/userguide/en/src/main/docbook/included/column.xml
trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml
Log:
RF-1740 - Sorting:added information, example code and screen;
added new key feature for <rich:scrollableDataTable> component.
Modified: trunk/docs/userguide/en/src/main/docbook/included/column.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/column.xml 2008-03-18 14:17:21 UTC (rev 6907)
+++ trunk/docs/userguide/en/src/main/docbook/included/column.xml 2008-03-18 14:40:26 UTC (rev 6908)
@@ -226,7 +226,7 @@
<para>In order to sort the data in descending order, you should double-click on the header of column, which you want to sort.</para>
<para><emphasis><property>"sortOrder"</property></emphasis> attribute may be possible in three states:
<itemizedlist>
- <listitem>
+ <listitem>
<emphasis><property>"none"</property></emphasis>
</listitem>
<listitem>
@@ -242,42 +242,43 @@
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
-<h:panelGrid columns="2" columnClasses="top">
- <rich:dataTable value="#{dataTableScrollerBean.allCars}" var="category" rows="5" id="table">
- <rich:column id="make" sortBy="#{category.make}" sortOrder="#{sortingBean.makeDirection}">
- <f:facet name="header"><h:outputText styleClass="headerText" value="Make" />
- <h:outputText value="#{category.make}" />
- </rich:column>
- <rich:column id="model" sortBy="#{category.model}" sortOrder="#{sortingBean.modelDirection}">
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Model" />
- </f:facet>
- <h:outputText value="#{category.model}" />
- </rich:column>
- <rich:column id="price" sortBy="#{category.price}" sortOrder="#{sortingBean.priceDirection}">
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Price" />
- </f:facet>
- <h:outputText value="#{category.price}" />
- </rich:column>
- <rich:column id="mileage" sortBy="#{category.mileage}" sortOrder="#{sortingBean.mileageDirection}">
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Mileage" />
- </f:facet>
- <h:outputText value="#{category.mileage}" />
- </rich:column>
- <rich:column width="200px" id="vin">
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="VIN" />
- </f:facet>
- <h:outputText value="#{category.vin}" />
- </rich:column>
- <rich:column id="stock">
- <f:facet name="header">
- <h:outputText styleClass="headerText" value="Stock" />
- </f:facet>
- <h:outputText value="#{category.stock}" />
- </rich:column>
+<rich:dataTable value="#{dataTableScrollerBean.allCars}" var="category" rows="5" id="table">
+ <rich:column id="make" sortBy="#{category.make}" sortOrder="#{sortingBean.makeDirection}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Make" />
+ </f:facet>
+ <h:outputText value="#{category.make}" />
+ </rich:column>
+ <rich:column id="model" sortBy="#{category.model}" sortOrder="#{sortingBean.modelDirection}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Model" />
+ </f:facet>
+ <h:outputText value="#{category.model}" />
+ </rich:column>
+ <rich:column id="price" sortBy="#{category.price}" sortOrder="#{sortingBean.priceDirection}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Price" />
+ </f:facet>
+ <h:outputText value="#{category.price}" />
+ </rich:column>
+ <rich:column id="mileage" sortBy="#{category.mileage}" sortOrder="#{sortingBean.mileageDirection}">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Mileage" />
+ </f:facet>
+ <h:outputText value="#{category.mileage}" />
+ </rich:column>
+ <rich:column width="200px" id="vin">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="VIN" />
+ </f:facet>
+ <h:outputText value="#{category.vin}" />
+ </rich:column>
+ <rich:column id="stock">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Stock" />
+ </f:facet>
+ <h:outputText value="#{category.stock}" />
+ </rich:column>
</rich:dataTable>
...]]></programlisting>
<para>Below you can see result:</para>
@@ -324,6 +325,67 @@
...
]]></programlisting>
<para>As a result, the second column will be unavailable for sorting.</para>
+ <para><emphasis><property>"sortable"</property></emphasis> attribute is used with <emphasis role="bold"><property><rich:scrollableDataTable></property></emphasis> component.</para>
+ <para>Below you can find example code of usage and result:</para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+ <programlisting role="XML"><![CDATA[...
+<h:form>
+ <rich:spacer height="30" />
+ <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px" width="700px" id="carList" rows="40" columnClasses="col"
+ value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single"
+ binding="#{dataTableScrollerBean.table}"
+ selection="#{dataTableScrollerBean.selection}">
+ <rich:column id="make" sortable="true">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Make" />
+ </f:facet>
+ <h:outputText value="#{category.make}" />
+ </rich:column>
+ <rich:column id="model">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Model" />
+ </f:facet>
+ <h:outputText value="#{category.model}" />
+ </rich:column>
+ <rich:column id="price">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Price" />
+ </f:facet>
+ <h:outputText value="#{category.price}" />
+ </rich:column>
+ <rich:column id="mileage">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Mileage" />
+ </f:facet>
+ <h:outputText value="#{category.mileage}" />
+ </rich:column>
+ <rich:column width="200px" id="vin">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="VIN" />
+ </f:facet>
+ <h:outputText value="#{category.vin}" />
+ </rich:column>
+ <rich:column id="stock">
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Stock" />
+ </f:facet>
+ <h:outputText value="#{category.stock}" />
+ </rich:column>
+ </rich:scrollableDataTable>
+ <rich:spacer height="20px"/>
+</h:form>
+...]]></programlisting>
+ <para>As a result, only the first column can be sorted.</para>
+ <figure>
+ <title>Sorting using the example of the <emphasis><property>"sortable"</property></emphasis> attribute</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/columnsort3.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
<para>Sorting can't be used together with pagination.</para>
</section>
<section>
@@ -362,7 +424,7 @@
<imagedata fileref="images/columnFilt1.png"/>
</imageobject>
</mediaobject>
- </figure>
+ </figure>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml 2008-03-18 14:17:21 UTC (rev 6907)
+++ trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml 2008-03-18 14:40:26 UTC (rev 6908)
@@ -33,6 +33,7 @@
<listitem>Fixed one or more left columns when table is scrolled horizontally</listitem>
<listitem>One and multi-selection rows mode</listitem>
<listitem>Built-it drag-n-drop support</listitem>
+ <listitem>Possibility to sort of columns</listitem>
</itemizedlist>
</section>
</section>
Added: trunk/docs/userguide/en/src/main/resources/images/columnsort3.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/columnsort3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 10 months
JBoss Rich Faces SVN: r6907 - in branches/3.1.x/ui/dropdown-menu/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: vbaranov
Date: 2008-03-18 10:17:21 -0400 (Tue, 18 Mar 2008)
New Revision: 6907
Modified:
branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java
branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
Log:
http://jira.jboss.com/jira/browse/RF-2548
Modified: branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java
===================================================================
--- branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2008-03-18 14:17:15 UTC (rev 6906)
+++ branches/3.1.x/ui/dropdown-menu/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2008-03-18 14:17:21 UTC (rev 6907)
@@ -74,6 +74,7 @@
buffer.append(".");
function = new JSFunction("asDropDown");
function.addParameter(component.getClientId(context));
+ function.addParameter(component.getClientId(context) + "_span");
String evt = (String) component.getAttributes().get("event");
if(evt == null || evt.trim().length() == 0){
evt = "onmouseover";
Modified: branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2008-03-18 14:17:15 UTC (rev 6906)
+++ branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2008-03-18 14:17:21 UTC (rev 6907)
@@ -47,7 +47,7 @@
<jsp:scriptlet>
<![CDATA[} else {]]>
</jsp:scriptlet>
- <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
+ <span id="#{clientId}_span" class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
<jsp:scriptlet>
<![CDATA[}]]>
</jsp:scriptlet>
16 years, 10 months
JBoss Rich Faces SVN: r6906 - in branches/3.1.x/ui/menu-components/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: vbaranov
Date: 2008-03-18 10:17:15 -0400 (Tue, 18 Mar 2008)
New Revision: 6906
Modified:
branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
branches/3.1.x/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
Log:
http://jira.jboss.com/jira/browse/RF-2548
Modified: branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-03-18 14:11:28 UTC (rev 6905)
+++ branches/3.1.x/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-03-18 14:17:15 UTC (rev 6906)
@@ -984,7 +984,7 @@
RichFaces.Menu.Layers.LMPopUpL(this.id, false);
// if (this.eventOnClose) this.eventOnClose();
},
- asDropDown: function(topLevel, onEvt, offEvt, options){
+ asDropDown: function(topLevel, bindElementId, onEvt, offEvt, options){
this.options = options || {};
if (this.options.ongroupactivate){
this.eventOnGroupActivate = this.options.ongroupactivate.bindAsEventListener(this);
@@ -1030,30 +1030,30 @@
}
offEvt = this.eventJsToPrototype(offEvt);
- var addBinding = function(eventName, handler) {
- var binding = new RichFaces.Menu.Layer.Binding(topLevel, eventName, handler);
+ var addBinding = function(elementId, eventName, handler) {
+ var binding = new RichFaces.Menu.Layer.Binding(elementId, eventName, handler);
this.bindings.push(binding);
binding.refresh();
}.bind(this);
if (onEvt == 'mouseover') {
- addBinding(onEvt, function(e) {
+ addBinding(topLevel, onEvt, function(e) {
menuOn.call(this, e);
mouseover.call(this, e);
}.bindAsEventListener(this));
} else {
- addBinding(onEvt, menuOn.bindAsEventListener(this));
- addBinding('mouseover', mouseover.bindAsEventListener(this));
+ addBinding(bindElementId, onEvt, menuOn.bindAsEventListener(this));
+ addBinding(topLevel, 'mouseover', mouseover.bindAsEventListener(this));
}
if (offEvt == 'mouseout') {
- addBinding(offEvt, function(e) {
+ addBinding(topLevel, offEvt, function(e) {
menuOff.call(this, e);
mouseout.call(this, e);
}.bindAsEventListener(this));
} else {
- addBinding(offEvt, menuOff.bindAsEventListener(this));
- addBinding('mouseout', mouseout.bindAsEventListener(this));
+ addBinding(bindElementId, offEvt, menuOff.bindAsEventListener(this));
+ addBinding(topLevel, 'mouseout', mouseout.bindAsEventListener(this));
}
RichFaces.Menu.Layers.horizontals[this.id] = topLevel;
Modified: branches/3.1.x/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx
===================================================================
--- branches/3.1.x/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2008-03-18 14:11:28 UTC (rev 6905)
+++ branches/3.1.x/ui/menu-components/src/main/templates/org/richfaces/htmlMenuItem.jspx 2008-03-18 14:17:15 UTC (rev 6906)
@@ -47,7 +47,7 @@
<div id="#{clientId}"
class="dr-menu-item dr-menu-item-enabled rich-menu-item rich-menu-item-enabled #{component.attributes['styleClass']}"
style="#{component.attributes['style']}"
- onclick="#{component.attributes['onselect']}; #{onclick}; Event.stop(event);"
+ onclick="#{component.attributes['onselect']}; #{onclick};"
onmouseup="Event.stop(event); #{component.attributes['onmouseup']}" >
<f:call name="utils.encodeAttributes">
<f:parameter value="onmousedown,onmousemove" />
16 years, 10 months
JBoss Rich Faces SVN: r6905 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits@lists.jboss.org
Author: andrei_exadel
Date: 2008-03-18 10:11:28 -0400 (Tue, 18 Mar 2008)
New Revision: 6905
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
RF-2478
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-18 13:57:11 UTC (rev 6904)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-18 14:11:28 UTC (rev 6905)
@@ -410,6 +410,7 @@
this.checkFrame();
this.initFileEntryWidth();
this.initLabels(labels);
+ this.element.onload = function () {this.initFileInput();}.bind(this);
this.initFileInput();
},
@@ -424,8 +425,16 @@
initFileInput: function () {
var o = this.currentInput.parentNode;
var p = o.parentNode;
- o.style.width = p.clientWidth;
- o.style.height = p.clientHeight;
+ p = $(p);
+ if (p.getWidth() != 0) {
+ o.style.width = p.getWidth() + "px";
+ o.style.height = p.getHeight() + "px";
+ p.onclick = null;
+ }else {
+ o.style.width = "30px";
+ o.style.height = "10px";
+ p.onclick = function () {this.initFileInput();}.bind(this);
+ }
},
initFileEntryWidth: function () {
@@ -446,11 +455,10 @@
createFrame: function () {
var div = document.createElement("div");
div.style.display = 'none';
- var child = "<iframe name='"+this.id+"' id='"+this.id+"_iframe'></iframe>";
+ var child = "<iframe name='"+this.id+"_iframe' id='"+this.id+"_iframe'></iframe>";
div.innerHTML = child;
document.body.appendChild(div);
var iframe = $(this.id + "_iframe");
-
this.iframe = iframe;
return iframe;
},
@@ -639,8 +647,8 @@
},
uploadAllDisabled: function () {
- if (this.runUpload && !this.options.autoUpload) {
- return false;
+ if (this.runUpload && this.activeEntry) {
+ return false;
} else {
var c = this.getFileEntriesSumByState(FileUploadEntry.READY, FileUploadEntry.INITIALIZED, FileUploadEntry.UPLOAD_CANCELED);
return (c == 0);
@@ -827,7 +835,7 @@
newState == FileUploadEntry.UPLOAD_TRANSFER_ERROR ||
newState == FileUploadEntry.UPLOAD_SERVER_ERROR) {
-
+
this._endUpload();
this.runUpload = false;
@@ -882,7 +890,7 @@
parentForm.encoding = "multipart/form-data";
parentForm.enctype = "multipart/form-data";
- parentForm.target = this.id;
+ parentForm.target = this.id + "_iframe";//this.id;
parentForm.action = oldAction + (/\?/.test(oldAction) ? '&_richfaces_upload_uid' : '?_richfaces_upload_uid') + '=' + encodeURI(entry.uid);
try {
@@ -922,7 +930,6 @@
}.bind(this));
parentForm.submit();
- //this.uploading = true;
}
for (var i = 0; i < l; i++) {
16 years, 10 months
JBoss Rich Faces SVN: r6904 - trunk/samples/richfaces-demo/src/main/webapp/templates/include.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-03-18 09:57:11 -0400 (Tue, 18 Mar 2008)
New Revision: 6904
Modified:
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-03-18 13:16:11 UTC (rev 6903)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-03-18 13:57:11 UTC (rev 6904)
@@ -7,7 +7,7 @@
<ui:composition>
<rich:panel styleClass="panel_menu">
-<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" height="550" width="100%">
+<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" width="100%">
<rich:panelBarItem id="ajaxSupport" label="Ajax Support">
<ui:include src="/templates/include/components-group.xhtml" >
<ui:param name="components" value="#{componentNavigator.ajaxSupport}" />
16 years, 10 months
JBoss Rich Faces SVN: r6903 - in branches/3.1.x/ui/panelmenu/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: vbaranov
Date: 2008-03-18 09:16:11 -0400 (Tue, 18 Mar 2008)
New Revision: 6903
Modified:
branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java
branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
Log:
http://jira.jboss.com/jira/browse/RF-2546
Modified: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java
===================================================================
--- branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2008-03-18 12:56:56 UTC (rev 6902)
+++ branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2008-03-18 13:16:11 UTC (rev 6903)
@@ -86,6 +86,20 @@
return params;
}
+
+ protected void preEncodeBegin(FacesContext context, UIComponent component) throws IOException {
+ super.preEncodeBegin(context, component);
+
+ // In case of encoding the UIPanelMenu in "expandSingle=true" mode
+ // the value of "firstExpandedEncoded" attribute should be reset to
+ // initial "false" state
+ if (component instanceof UIPanelMenu) {
+ UIPanelMenu panelMenu = (UIPanelMenu) component;
+ if (panelMenu.isExpandSingle()) {
+ panelMenu.getAttributes().put("firstExpandedEncoded", Boolean.FALSE);
+ }
+ }
+ }
public void insertScript(FacesContext context, UIComponent component)
throws IOException {
Modified: branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js
===================================================================
--- branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2008-03-18 12:56:56 UTC (rev 6902)
+++ branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2008-03-18 13:16:11 UTC (rev 6903)
@@ -286,9 +286,11 @@
this.expand();
}
}
- if (this.action){
- this.trigger(e);
- }
+ // trigger event not only for action, but also for actionListener
+ this.trigger(e);
+ //if (this.action){
+ // this.trigger(e);
+ //}
this.parentObj.lastExpanded = this;
} else {
if ("node" == this.type){
16 years, 10 months
JBoss Rich Faces SVN: r6902 - in trunk/samples/inplaceInput-sample/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-03-18 08:56:56 -0400 (Tue, 18 Mar 2008)
New Revision: 6902
Modified:
trunk/samples/inplaceInput-sample/src/main/java/org/richfaces/samples/Bean.java
trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp
trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml
Log:
Modified: trunk/samples/inplaceInput-sample/src/main/java/org/richfaces/samples/Bean.java
===================================================================
--- trunk/samples/inplaceInput-sample/src/main/java/org/richfaces/samples/Bean.java 2008-03-18 12:30:57 UTC (rev 6901)
+++ trunk/samples/inplaceInput-sample/src/main/java/org/richfaces/samples/Bean.java 2008-03-18 12:56:56 UTC (rev 6902)
@@ -26,7 +26,7 @@
private String value = "New York";
- private String editEvent = "click";
+ private String editEvent = "onclick";
private String oneditactivation;
Modified: trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp 2008-03-18 12:30:57 UTC (rev 6901)
+++ trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp 2008-03-18 12:56:56 UTC (rev 6902)
@@ -106,7 +106,6 @@
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
- inputMaxLength="#{bean.inputMaxLength}"
controlsVerticalPosition="#{bean.controlsPosition}"
controlsHorizontalPosition="#{bean.controlsHorizontalAlign}"
editEvent="#{bean.editEvent}"
@@ -126,7 +125,6 @@
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
- inputMaxLength="#{bean.inputMaxLength}"
controlsVerticalPosition="#{bean.controlsPosition}"
controlsHorizontalPosition="#{bean.controlsHorizontalAlign}"
editEvent="#{bean.editEvent}"
@@ -148,7 +146,6 @@
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
- inputMaxLength="#{bean.inputMaxLength}"
controlsVerticalPosition="#{bean.controlsPosition}"
controlsHorizontalPosition="#{bean.controlsHorizontalAlign}"
editEvent="#{bean.editEvent}"
@@ -168,7 +165,6 @@
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
- inputMaxLength="#{bean.inputMaxLength}"
controlsVerticalPosition="#{bean.controlsPosition}"
controlsHorizontalPosition="#{bean.controlsHorizontalAlign}"
editEvent="#{bean.editEvent}"
Modified: trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml 2008-03-18 12:30:57 UTC (rev 6901)
+++ trunk/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml 2008-03-18 12:56:56 UTC (rev 6902)
@@ -47,9 +47,6 @@
<h:outputText value="maxInputWidth (in 'px'): " />
<h:inputText value="#{bean.maxInputWidth}" />
- <h:outputText value="inputMaxLength: " />
- <h:inputText value="#{bean.inputMaxLength}" />
-
<h:outputText value="controlsVerticalPosition (default: center is: " />
<h:inputText value="#{bean.controlsPosition}" />
@@ -85,7 +82,6 @@
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
- inputMaxLength="#{bean.inputMaxLength}"
controlsPosition="#{bean.controlsPosition}"
controlsHorizontalAlign="#{bean.controlsHorizontalAlign}"
editEvent="#{bean.editEvent}"
@@ -110,7 +106,6 @@
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
- inputMaxLength="#{bean.inputMaxLength}"
controlsPosition="#{bean.controlsPosition}"
controlsHorizontalAlign="#{bean.controlsHorizontalAlign}"
editEvent="#{bean.editEvent}"
@@ -130,7 +125,6 @@
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
- inputMaxLength="#{bean.inputMaxLength}"
controlsPosition="#{bean.controlsPosition}"
controlsHorizontalAlign="#{bean.controlsHorizontalAlign}"
editEvent="#{bean.editEvent}"
@@ -152,7 +146,6 @@
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
- inputMaxLength="#{bean.inputMaxLength}"
controlsPosition="#{bean.controlsPosition}"
controlsHorizontalAlign="#{bean.controlsHorizontalAlign}"
editEvent="#{bean.editEvent}"
@@ -172,7 +165,6 @@
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
- inputMaxLength="#{bean.inputMaxLength}"
controlsPosition="#{bean.controlsPosition}"
controlsHorizontalAlign="#{bean.controlsHorizontalAlign}"
editEvent="#{bean.editEvent}"
16 years, 10 months
JBoss Rich Faces SVN: r6901 - branches/3.1.x/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits@lists.jboss.org
Author: vbaranov
Date: 2008-03-18 08:30:57 -0400 (Tue, 18 Mar 2008)
New Revision: 6901
Modified:
branches/3.1.x/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-2545
Modified: branches/3.1.x/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
===================================================================
--- branches/3.1.x/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2008-03-18 12:30:38 UTC (rev 6900)
+++ branches/3.1.x/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2008-03-18 12:30:57 UTC (rev 6901)
@@ -107,10 +107,16 @@
panel.setOpened(new Boolean((String) clnId).booleanValue());
}
+ // in case of "ajax" request and "ajax" switch mode of toggle panel
+ // set the regions to be rendered (reRendered) after operating this "ajax" request
if (AjaxRendererUtils.isAjaxRequest(context) && panel.getSwitchType().equals(UISimpleTogglePanel.AJAX_SWITCH_TYPE)) {
- AjaxRendererUtils.addRegionByName(context,
+ // add toggle panel itself to rendered list of components
+ AjaxRendererUtils.addRegionByName(context,
panel,
panel.getId());
+ // add regions specified in the "reRender" attribute of toggle panel
+ // to rendered list of components
+ AjaxRendererUtils.addRegionsFromComponent(panel, context);
}
}
16 years, 10 months
JBoss Rich Faces SVN: r6900 - trunk/samples/inplaceSelect-sample/src/main/java/org/richfaces.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-03-18 08:30:38 -0400 (Tue, 18 Mar 2008)
New Revision: 6900
Modified:
trunk/samples/inplaceSelect-sample/src/main/java/org/richfaces/Bean.java
Log:
Modified: trunk/samples/inplaceSelect-sample/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/samples/inplaceSelect-sample/src/main/java/org/richfaces/Bean.java 2008-03-18 12:22:45 UTC (rev 6899)
+++ trunk/samples/inplaceSelect-sample/src/main/java/org/richfaces/Bean.java 2008-03-18 12:30:38 UTC (rev 6900)
@@ -25,7 +25,7 @@
*/
public class Bean {
- private String editEvent = "click";
+ private String editEvent = "onclick";
private String maxSelectWidth;
16 years, 10 months
JBoss Rich Faces SVN: r6899 - trunk/framework/impl/src/main/javascript/jquery.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2008-03-18 08:22:45 -0400 (Tue, 18 Mar 2008)
New Revision: 6899
Modified:
trunk/framework/impl/src/main/javascript/jquery/patches.js
Log:
RF-1953
Modified: trunk/framework/impl/src/main/javascript/jquery/patches.js
===================================================================
--- trunk/framework/impl/src/main/javascript/jquery/patches.js 2008-03-18 12:21:47 UTC (rev 6898)
+++ trunk/framework/impl/src/main/javascript/jquery/patches.js 2008-03-18 12:22:45 UTC (rev 6899)
@@ -6,13 +6,14 @@
//if (jQuery(jQuery) != jQuery) {
if (!window.RichFaces.isJQueryWrapped) {
var oldJQuery = jQuery;
- jQuery = function() {
- if (arguments[0] == arguments.callee) {
- return arguments.callee;
- } else {
- return oldJQuery.apply(this, arguments);
- }
- };
+// moved to original jQuery function
+// jQuery = function() {
+// if (arguments[0] == arguments.callee) {
+// return arguments.callee;
+// } else {
+// return oldJQuery.apply(this, arguments);
+// }
+// };
if (window.RichFaces && window.RichFaces.Memory) {
window.RichFaces.Memory.addCleaner("jquery", function(node) {
16 years, 10 months