diff --git a/src/main/java/net/bootsfaces/component/DatePicker.java b/src/main/java/net/bootsfaces/component/DatePicker.java index c502bba2a..654a5c0e7 100644 --- a/src/main/java/net/bootsfaces/component/DatePicker.java +++ b/src/main/java/net/bootsfaces/component/DatePicker.java @@ -335,6 +335,9 @@ private void encodeJS(FacesContext fc, ResponseWriter rw, String cId, String dpI if (mode.equals("toggle-icon") || mode.equals("icon-toggle")) { sb.append(JQ.SHOWON).append(":").append("'" + "button" + "'").append(","); } + if(A.toBool(attrs.get(JQ.DTDISABLED))) { + sb.append(JQ.DTDISABLED).append(":").append("true").append(","); + } /* * Attributes that need decoding the Date diff --git a/src/main/java/net/bootsfaces/component/badge/Badge.java b/src/main/java/net/bootsfaces/component/badge/Badge.java index 3facc2317..6eed39261 100644 --- a/src/main/java/net/bootsfaces/component/badge/Badge.java +++ b/src/main/java/net/bootsfaces/component/badge/Badge.java @@ -45,8 +45,6 @@ public class Badge extends UIOutput { private Map attributes; public Badge() { - - setRendererType(DEFAULT_RENDERER); } @@ -62,10 +60,10 @@ public Map getAttributes() { } protected enum PropertyKeys { -binding, -style, -styleClass -; + binding, + style, + styleClass + ; String toString; diff --git a/src/main/java/net/bootsfaces/render/CoreRenderer.java b/src/main/java/net/bootsfaces/render/CoreRenderer.java index eed943671..bc8845bbd 100644 --- a/src/main/java/net/bootsfaces/render/CoreRenderer.java +++ b/src/main/java/net/bootsfaces/render/CoreRenderer.java @@ -338,15 +338,28 @@ public String getValue2Render(FacesContext fc, UIComponent c) { // format the value as string if (val != null) { + /* OLD Converter converter = getConverter(fc, vh); - - if (converter != null) + */ + + /* NEW */ + Converter converter = vh.getConverter(); + if (converter == null) { + Class valueType = val.getClass(); + if(valueType == String.class) { + return (String) val; + } + + converter = fc.getApplication().createConverter(valueType); + } + /* END NEW */ + + if (converter != null) return converter.getAsString(fc, c, val); else return val.toString(); // Use toString as a fallback if // there is no explicit or implicit // converter - } else { // component is a value holder but has no value return null; diff --git a/src/main/java/net/bootsfaces/render/JQ.java b/src/main/java/net/bootsfaces/render/JQ.java index 8358b1acf..2866ebc3a 100644 --- a/src/main/java/net/bootsfaces/render/JQ.java +++ b/src/main/java/net/bootsfaces/render/JQ.java @@ -154,6 +154,7 @@ public static void simpleSlider(ResponseWriter rw, String cId, String opts, bool public static final String CHNGYEAR = "changeYear"; //Bool public static final String SHOWWK = "showWeek"; //Bool public static final String DTFORMAT = "dateFormat"; + public static final String DTDISABLED = "disabled"; //Bool /* * Default: "c-10:c+10" * The range of years displayed in the year drop-down: