JBoss Rich Faces SVN: r7700 - trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-04-09 09:06:51 -0400 (Wed, 09 Apr 2008)
New Revision: 7700
Modified:
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
Log:
http://jira.jboss.com/jira/browse/RF-2966
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-09 13:03:47 UTC (rev 7699)
+++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-04-09 13:06:51 UTC (rev 7700)
@@ -174,7 +174,8 @@
|| (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.saveValue(this.currentItemValue, this.tempValueKeeper.value);
+ var unescapeText = this.tempValueKeeper.value.unescapeHTML();
+ this.saveValue(this.currentItemValue, unescapeText);
}
this.comboList.hide();
16 years, 9 months
JBoss Rich Faces SVN: r7699 - trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-04-09 09:03:47 -0400 (Wed, 09 Apr 2008)
New Revision: 7699
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/combolist.js
Log:
http://jira.jboss.com/jira/browse/RF-2966
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-09 13:02:40 UTC (rev 7698)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-04-09 13:03:47 UTC (rev 7699)
@@ -286,7 +286,7 @@
if (!this.comboList.activeItem) {
return;
}
- var value = this.comboList.activeItem.innerHTML;
+ var value = this.comboList.activeItem.innerHTML.unescapeHTML();
if (toSetOnly) {
var oV = this.field.value;
if (oV == value) {
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-09 13:02:40 UTC (rev 7698)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-09 13:03:47 UTC (rev 7699)
@@ -371,7 +371,8 @@
},
createItem : function(text, className) {
- return "<span class=\"" + className+ "\">" + text + "</span>";
+ var escapedText = text.escapeHTML();
+ return "<span class=\"" + className+ "\">" + escapedText + "</span>";
},
createIframe : function(parentElem, width, comboboxId, classes) {
16 years, 9 months
JBoss Rich Faces SVN: r7698 - branches/3.2.x/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-04-09 09:02:40 -0400 (Wed, 09 Apr 2008)
New Revision: 7698
Modified:
branches/3.2.x/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
Log:
http://jira.jboss.com/jira/browse/RF-2966
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-09 13:02:12 UTC (rev 7697)
+++ branches/3.2.x/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2008-04-09 13:02:40 UTC (rev 7698)
@@ -178,7 +178,8 @@
save : function($super) {
this.applyTmpValue();
if (!this.comboList.isList || this.clickOnBar) {
- this.saveValue(this.currentItemValue, this.tempValueKeeper.value);
+ var unescapeText = this.tempValueKeeper.value.unescapeHTML();
+ this.saveValue(this.currentItemValue, unescapeText);
}
if (this.attributes.showControls) {
16 years, 9 months
JBoss Rich Faces SVN: r7697 - 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-09 09:02:12 -0400 (Wed, 09 Apr 2008)
New Revision: 7697
Modified:
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
Log:
http://jira.jboss.com/jira/browse/RF-2966
Modified: branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-04-09 12:57:50 UTC (rev 7696)
+++ branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-04-09 13:02:12 UTC (rev 7697)
@@ -286,7 +286,7 @@
if (!this.comboList.activeItem) {
return;
}
- var value = this.comboList.activeItem.innerHTML;
+ var value = this.comboList.activeItem.innerHTML.unescapeHTML();
if (toSetOnly) {
var oV = this.field.value;
if (oV == 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-09 12:57:50 UTC (rev 7696)
+++ branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-09 13:02:12 UTC (rev 7697)
@@ -371,7 +371,8 @@
},
createItem : function(text, className) {
- return "<span class=\"" + className+ "\">" + text + "</span>";
+ var escapedText = text.escapeHTML();
+ return "<span class=\"" + className+ "\">" + escapedText + "</span>";
},
createIframe : function(parentElem, width, comboboxId, classes) {
16 years, 9 months
JBoss Rich Faces SVN: r7696 - trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2008-04-09 08:57:50 -0400 (Wed, 09 Apr 2008)
New Revision: 7696
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
Log:
RF-2010
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2008-04-09 12:46:18 UTC (rev 7695)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2008-04-09 12:57:50 UTC (rev 7696)
@@ -385,7 +385,7 @@
row_id = baseClientId + ":f:" + state.getRowIndex();
writer.startElement("tr", grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass());
+ getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass());
getUtils().writeAttribute(writer,"id",row_id);
addRowJavascriptEvents(writer, grid);
collection.add(row_id);
@@ -440,7 +440,7 @@
writer.startElement("tr", grid);
getUtils().writeAttribute(writer,"id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass());
+ getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass());
addRowJavascriptEvents(writer, grid);
collection.add(row_id);
}
16 years, 9 months
JBoss Rich Faces SVN: r7695 - trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component.
by richfaces-svn-commits@lists.jboss.org
Author: andrei_exadel
Date: 2008-04-09 08:46:18 -0400 (Wed, 09 Apr 2008)
New Revision: 7695
Modified:
trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
Log:
RF-2963
Modified: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2008-04-09 12:45:19 UTC (rev 7694)
+++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2008-04-09 12:46:18 UTC (rev 7695)
@@ -22,6 +22,7 @@
package org.richfaces.component;
import javax.faces.component.ActionSource;
+import javax.faces.context.FacesContext;
import org.ajax4jsf.component.AjaxActionComponent;
import org.ajax4jsf.component.AjaxComponent;
@@ -65,18 +66,31 @@
return true;
}
-/* public void setValueBinding(String arg0, ValueBinding arg1) {
- if ("opened".equals(arg0))
- super.setValueBinding("value", arg1);
- super.setValueBinding(arg0, arg1);
- }
+ public void processDecodes(FacesContext context) {
+ if (isOpened()) {
+ super.processDecodes(context);
+ } else {
+ if (context == null) {
+ throw new NullPointerException();
+ }
+ // Skip processing if our rendered flag is false
+ if (!isRendered()) {
+ return;
+ }
+ decode(context);
+ }
+ }
- public ValueBinding getValueBinding(String arg0) {
- if ("opened".equals(arg0))
- return super.getValueBinding("value");
- return super.getValueBinding(arg0);
- }
-*/
+
+
+/*
+ * public void setValueBinding(String arg0, ValueBinding arg1) { if
+ * ("opened".equals(arg0)) super.setValueBinding("value", arg1);
+ * super.setValueBinding(arg0, arg1); }
+ *
+ * public ValueBinding getValueBinding(String arg0) { if ("opened".equals(arg0))
+ * return super.getValueBinding("value"); return super.getValueBinding(arg0); }
+ */
//public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
// super.broadcast(facesEvent);
// FacesContext facesContext = FacesContext.getCurrentInstance();
16 years, 9 months
JBoss Rich Faces SVN: r7694 - trunk/ui/orderingList/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: vmolotkov
Date: 2008-04-09 08:45:19 -0400 (Wed, 09 Apr 2008)
New Revision: 7694
Modified:
trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-2896
Modified: trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
===================================================================
--- trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2008-04-09 11:58:53 UTC (rev 7693)
+++ trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2008-04-09 12:45:19 UTC (rev 7694)
@@ -341,7 +341,7 @@
writer.startElement(HTML.a_ELEMENT, orderingList);
writer.writeAttribute(HTML.id_ATTRIBUTE, controlId + "link", null); // FIXME:
- writer.writeAttribute(HTML.HREF_ATTR, "#", null);
+ //writer.writeAttribute(HTML.HREF_ATTR, "#", null);
writer.writeAttribute(HTML.onclick_ATTRIBUTE, "return false;", null);
writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle
16 years, 9 months
JBoss Rich Faces SVN: r7693 - trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2008-04-09 07:58:53 -0400 (Wed, 09 Apr 2008)
New Revision: 7693
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
Log:
RF-2953
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-04-09 11:43:39 UTC (rev 7692)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-04-09 11:58:53 UTC (rev 7693)
@@ -218,6 +218,9 @@
this.scrollBox.setWidth(width);
this.scrollBox.setHeight(height);
+ this.defaultRowHeight = this._calcDefaultRowHeight();
+ this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
+
height = this.scrollBox.getElement().clientHeight;
this.contentBox.setHeight(height - fixH);
@@ -225,9 +228,10 @@
this.frozenContentBox.setHeight(height - fixH);
this.container.setHeight(height - fixH);
- this.defaultRowHeight = this._calcDefaultRowHeight();
+ //http://jira.jboss.com/jira/browse/RF-2953
+ //this.defaultRowHeight = this._calcDefaultRowHeight();
this.scrollBox.hide();
- this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
+ //this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
this.helpObject1.moveToY(this.sizeBox.element.offsetHeight+ this.defaultRowHeight + 5);
this.helpObject2.moveToY(this.sizeBox.element.offsetHeight+ this.defaultRowHeight + 5);
16 years, 9 months
JBoss Rich Faces SVN: r7692 - trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: vmolotkov
Date: 2008-04-09 07:43:39 -0400 (Wed, 09 Apr 2008)
New Revision: 7692
Modified:
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
Log:
bug RF-2844
Modified: trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
--- trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2008-04-09 11:39:14 UTC (rev 7691)
+++ trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2008-04-09 11:43:39 UTC (rev 7692)
@@ -164,6 +164,9 @@
},
moveItem : function(sourceComponent, targetComponent, item) {
+ if (!item) {
+ return;
+ }
if (!(item instanceof Richfaces.SelectItem)) {
item = sourceComponent.getSelectItemByNode(item);
}
16 years, 9 months
JBoss Rich Faces SVN: r7691 - branches/3.1.x/test-applications.
by richfaces-svn-commits@lists.jboss.org
Author: ayanul
Date: 2008-04-09 07:39:14 -0400 (Wed, 09 Apr 2008)
New Revision: 7691
Modified:
branches/3.1.x/test-applications/pom.xml
Log:
fix
Modified: branches/3.1.x/test-applications/pom.xml
===================================================================
--- branches/3.1.x/test-applications/pom.xml 2008-04-09 11:34:34 UTC (rev 7690)
+++ branches/3.1.x/test-applications/pom.xml 2008-04-09 11:39:14 UTC (rev 7691)
@@ -22,36 +22,36 @@
<url>http://maven.exadel.com/</url>
<layout>default</layout>
</repository-->
+
<repository>
<releases>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</releases>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
- <id>repository.jboss.org</id>
- <name>JBoss repository repository</name>
- <url>http://repository.jboss.org/maven2/</url>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss snapshots repository</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
<layout>default</layout>
</repository>
<repository>
<releases>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</releases>
<snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
+ <enabled>false</enabled>
</snapshots>
- <id>snapshots.jboss.org</id>
- <name>JBoss snapshots repository</name>
- <url>http://snapshots.jboss.org/maven2/</url>
+ <id>repository.jboss.org</id>
+ <name>JBoss repository</name>
+ <url>http://repository.jboss.org/maven2/</url>
<layout>default</layout>
- </repository>
+ </repository>
</repositories>
<modelVersion>4.0.0</modelVersion>
@@ -89,16 +89,6 @@
<groupId>org.richfaces.ui</groupId>
<version>${rfVersion}</version>
</dependency>
- <dependency>
-
- <groupId>org.richfaces.ui</groupId>
-
- <artifactId>core</artifactId>
-
- <version>${rfVersion}</version>
- <scope>provided</scope>
-
- </dependency>
<dependency>
<artifactId>richfaces-impl</artifactId>
<groupId>org.richfaces.framework</groupId>
16 years, 9 months