You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/07/03 08:51:39 UTC
svn commit: r1356581 -
/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
Author: lofwyr
Date: Tue Jul 3 06:51:38 2012
New Revision: 1356581
URL: http://svn.apache.org/viewvc?rev=1356581&view=rev
Log:
TOBAGO-1168: '"' and '\' are not escaped inside inputSuggest
Merged from trunk [from revision 1356512]
Modified:
myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java (contents, props changed)
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java?rev=1356581&r1=1356580&r2=1356581&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java Tue Jul 3 06:51:38 2012
@@ -17,6 +17,7 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
+import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UIIn;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
@@ -189,11 +190,17 @@ public class InRenderer extends InputRen
if (i > 0) {
writer.write(", ");
}
- writer.write("{label: \"");
- writer.write(suggestItem.getLabel());
- writer.write("\", value: \"");
- writer.write(suggestItem.getValue());
- writer.write("\"");
+ writer.write("{label: '");
+ String label = suggestItem.getLabel();
+ label = StringUtils.replace(label, "\\", "\\\\");
+ label = StringUtils.replace(label, "\"", "\\\"");
+ writer.write(label);
+ writer.write("', value: '");
+ String value = suggestItem.getLabel();
+ value = StringUtils.replace(value, "\\", "\\\\");
+ value = StringUtils.replace(value, "\"", "\\\"");
+ writer.write(value);
+ writer.write("'");
if (suggestItem.getExtensionItems() != null) {
writer.write(", values: [");
for (int j = 0; j < suggestItem.getExtensionItems().size(); j++) {
@@ -201,18 +208,18 @@ public class InRenderer extends InputRen
if (j > 0) {
writer.write(", ");
}
- writer.write("{id: \"");
+ writer.write("{id: '");
writer.write(item.getId());
- writer.write("\", value: \"");
+ writer.write("', value: '");
writer.write(item.getValue());
- writer.write("\"}");
+ writer.write("'}");
}
writer.write("]");
}
if (suggestItem.getNextFocusId() != null) {
- writer.write(", nextFocusId: \"");
+ writer.write(", nextFocusId: '");
writer.write(suggestItem.getNextFocusId());
- writer.write("\"");
+ writer.write("'");
}
writer.write("}");
Propchange: myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jul 3 06:51:38 2012
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java:1341831,1341901,1343719,1349356,1351660,1353071,1353854,1354247,1354395,1354437,1354454,1354539,1356512