Fix primefaces#4036: Cleaned up fix for escaping.

melloware · Sep 17, 2018 · b108107 · b108107
1 parent 4ea7a60
commit b108107
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/org/primefaces/component/picklist/PickListRenderer.java b/src/main/java/org/primefaces/component/picklist/PickListRenderer.java
@@ -307,7 +307,12 @@ protected void encodeOptions(FacesContext context, PickList pickList, List model
                     RendererUtils.encodeCheckbox(context, false);
                 }
 
-                writer.writeText(itemLabel, null);
+                if (pickList.isEscape()) {
+                    writer.writeText(itemLabel, null);
+                }
+                else {
+                    writer.write(itemLabel);
+                }
             }
 
             writer.endElement("li");

diff --git a/src/main/resources/META-INF/resources/primefaces/picklist/picklist.js b/src/main/resources/META-INF/resources/primefaces/picklist/picklist.js
@@ -369,16 +369,13 @@ PrimeFaces.widget.PickList = PrimeFaces.widget.BaseWidget.extend({
         list.children('.ui-picklist-item').each(function() {
             var item = $(this),
             itemValue = item.attr('data-item-value'),
-            itemLabel = item.attr('data-item-label') ? item.attr('data-item-label') : '',
+            itemLabel = item.attr('data-item-label') ? PrimeFaces.escapeHTML(item.attr('data-item-label')) : '',
             option = $('<option selected="selected"></option>');
 
             if ($this.cfg.escape) {
                itemValue = PrimeFaces.escapeHTML(itemValue);
-               itemLabel = PrimeFaces.escapeHTML(itemLabel);
-               option.prop('value', itemValue).text(itemLabel);
-            } else {
-               option.prop('value', itemValue).html(itemLabel);
             }
+            option.prop('value', itemValue).text(itemLabel);
 
             input.append(option);
         });