You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/12/19 13:47:31 UTC

svn commit: r1423845 - in /myfaces/tomahawk/trunk: core/src/main/java/org/apache/myfaces/custom/picklist/ core/src/main/resources/org/apache/myfaces/custom/picklist/resource/ core20/src/main/java/org/apache/myfaces/custom/picklist/ core20/src/main/java...

Author: werpu
Date: Wed Dec 19 12:47:29 2012
New Revision: 1423845

URL: http://svn.apache.org/viewvc?rev=1423845&view=rev
Log:
TOMAHAWK-1653 fixing the issue by introducing a divider string instead of a divider char

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java
    myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/picklist/resource/picklist.js
    myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java
    myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.picklist/picklist.js

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java?rev=1423845&r1=1423844&r2=1423845&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java Wed Dec 19 12:47:29 2012
@@ -97,7 +97,7 @@ public class HtmlPicklistRenderer extend
             }
             else
             {
-                String[] reqValues = valuesInline[0].split(",");
+                String[] reqValues = valuesInline[0].split("\\|MFVAL\\_DIV\\|");
                 ((EditableValueHolder) uiComponent)
                 .setSubmittedValue(reqValues);
             }

Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/picklist/resource/picklist.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/picklist/resource/picklist.js?rev=1423845&r1=1423844&r2=1423845&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/picklist/resource/picklist.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/picklist/resource/picklist.js Wed Dec 19 12:47:29 2012
@@ -102,7 +102,9 @@ if (!org.apache.myfaces.Picklist) {
         for (var i = 0; i < selectedList.options.length; i++) {
             arrValues[i] = selectedList.options[i].value;
         }
-
-        hiddenField.value = arrValues.join();
+        //https://issues.apache.org/jira/browse/TOMAHAWK-1653
+        //we set a neutral divider string, which allows
+        //comma and other dividiers to be used
+        hiddenField.value = arrValues.join("|MFVAL_DIV|");
     };
 }
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java?rev=1423845&r1=1423844&r2=1423845&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/picklist/HtmlPicklistRenderer.java Wed Dec 19 12:47:29 2012
@@ -100,7 +100,7 @@ public class HtmlPicklistRenderer extend
             }
             else
             {
-                String[] reqValues = valuesInline[0].split(",");
+                String[] reqValues = valuesInline[0].split("\\|MFVAL\\_DIV\\|");
                 ((EditableValueHolder) uiComponent)
                 .setSubmittedValue(reqValues);
             }

Modified: myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.picklist/picklist.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.picklist/picklist.js?rev=1423845&r1=1423844&r2=1423845&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.picklist/picklist.js (original)
+++ myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.picklist/picklist.js Wed Dec 19 12:47:29 2012
@@ -102,7 +102,9 @@ if (!org.apache.myfaces.Picklist) {
         for (var i = 0; i < selectedList.options.length; i++) {
             arrValues[i] = selectedList.options[i].value;
         }
-
-        hiddenField.value = arrValues.join();
+        //https://issues.apache.org/jira/browse/TOMAHAWK-1653
+        //we set a neutral divider string, which allows
+        //comma and other dividiers to be used
+        hiddenField.value = arrValues.join("|MFVAL_DIV|");
     };
 }
\ No newline at end of file