diff --git a/src/main/java/net/bootsfaces/component/ComponentsEnum.java b/src/main/java/net/bootsfaces/component/ComponentsEnum.java index b795a7223..e9c49e4e5 100644 --- a/src/main/java/net/bootsfaces/component/ComponentsEnum.java +++ b/src/main/java/net/bootsfaces/component/ComponentsEnum.java @@ -18,96 +18,237 @@ package net.bootsfaces.component; public enum ComponentsEnum { - accordion(" + * @return Returns the value of the attribute, or 1, if it hasn't been set by the JSF file. + */ + public int getBadgeSpan() { + return (int) (Integer) getStateHelper().eval(PropertyKeys.badgeSpan, 1); + } + + /** + * The column span of the badge or input field (if it's shown).

+ * Usually this method is called internally by the JSF engine. + */ + public void setBadgeSpan(int _badgeSpan) { + getStateHelper().put(PropertyKeys.badgeSpan, _badgeSpan); + } + /** * Inline style of the badge or input field (if it's shown).

* @return Returns the value of the attribute, or null, if it hasn't been set by the JSF file. diff --git a/src/main/java/net/bootsfaces/component/slider/SliderRenderer.java b/src/main/java/net/bootsfaces/component/slider/SliderRenderer.java index 47fb14219..1a38b2653 100644 --- a/src/main/java/net/bootsfaces/component/slider/SliderRenderer.java +++ b/src/main/java/net/bootsfaces/component/slider/SliderRenderer.java @@ -157,7 +157,7 @@ private void encodeHTML(Slider slider, FacesContext context, ResponseWriter rw) rw.startElement("div", null); rw.writeAttribute("class", "row", "class"); if (bottom) { - encodeSliderDiv(rw, isVertical, mode, span, clientId); + encodeSliderDiv(rw, isVertical, mode, span, slider.getBadgeSpan(), clientId); rw.endElement("div");/* Row */ rw.startElement("div", null); rw.writeAttribute("class", "row", "class"); @@ -168,7 +168,7 @@ private void encodeHTML(Slider slider, FacesContext context, ResponseWriter rw) rw.startElement("div", null); rw.writeAttribute("class", "row " + getErrorAndRequiredClass(slider, clientId), "class"); - encodeSliderDiv(rw, isVertical, mode, span, clientId); + encodeSliderDiv(rw, isVertical, mode, span, slider.getBadgeSpan(), clientId); } rw.endElement("div"); /* Row */ if (label != null && bottom) { @@ -215,7 +215,7 @@ private void encodeHTML(Slider slider, FacesContext context, ResponseWriter rw) encodeInput(slider, rw, mode, context, val, clientId, isVertical, min, max); - encodeSliderDiv(rw, isVertical, mode, span, clientId); + encodeSliderDiv(rw, isVertical, mode, span, slider.getBadgeSpan(), clientId); rw.endElement("div");/* Row */ } @@ -243,7 +243,7 @@ private void encodeVLabel(Slider slider, ResponseWriter rw, String label) throws private void encodeInput(Slider slider, ResponseWriter rw, String mode, FacesContext context, int val, String clientId, boolean vo, int min, int max) throws IOException { - int cols = (vo ? 12 : 1); + int cols = (vo ? 12 : slider.getBadgeSpan()); if (!mode.equals("basic")) { /* * int span, int offset, int cxs, int csm, int clg, int oxs, int @@ -309,11 +309,11 @@ private void removeMisleadingType(Slider slider) { } - private void encodeSliderDiv(ResponseWriter rw, boolean vo, String mode, int span, String clientId) + private void encodeSliderDiv(ResponseWriter rw, boolean vo, String mode, int span, int badgeSpan, String clientId) throws IOException { int cols = span; if (!mode.equals("basic")) { - cols--; + cols -= badgeSpan; } /* * int span, int offset, int cxs, int csm, int clg, int oxs, int osm, diff --git a/src/main/java/net/bootsfaces/component/slider2/Slider2Core.java b/src/main/java/net/bootsfaces/component/slider2/Slider2Core.java index 8af8c9ba7..6ee546387 100644 --- a/src/main/java/net/bootsfaces/component/slider2/Slider2Core.java +++ b/src/main/java/net/bootsfaces/component/slider2/Slider2Core.java @@ -24,7 +24,7 @@ public abstract class Slider2Core extends HtmlInputText { protected enum PropertyKeys { - autoUpdate, badgeStyle, badgeStyleClass, binding, disabled, focus, formatter, handleShape, inline, label, labelStyle, labelStyleClass, labelledBy, max, min, mode, natural_arrow_keys, orientation, precision, reversed, scale, selection, span, step, style, styleClass, tooltipSliderPosition, tooltipSplit, tooltipVisibility; + autoUpdate, badgeSpan, badgeStyle, badgeStyleClass, binding, disabled, focus, formatter, handleShape, inline, label, labelStyle, labelStyleClass, labelledBy, max, min, mode, natural_arrow_keys, orientation, precision, reversed, scale, selection, span, step, style, styleClass, tooltipSliderPosition, tooltipSplit, tooltipVisibility; String toString; PropertyKeys(String toString) { @@ -55,6 +55,22 @@ public void setAutoUpdate(boolean _autoUpdate) { getStateHelper().put(PropertyKeys.autoUpdate, _autoUpdate); } + /** + * The column span of the badge or input field (if it's shown).

+ * @return Returns the value of the attribute, or 1, if it hasn't been set by the JSF file. + */ + public int getBadgeSpan() { + return (int) (Integer) getStateHelper().eval(PropertyKeys.badgeSpan, 1); + } + + /** + * The column span of the badge or input field (if it's shown).

+ * Usually this method is called internally by the JSF engine. + */ + public void setBadgeSpan(int _badgeSpan) { + getStateHelper().put(PropertyKeys.badgeSpan, _badgeSpan); + } + /** * Inline style of the badge or input field (if it's shown).

* @return Returns the value of the attribute, or null, if it hasn't been set by the JSF file. diff --git a/src/main/java/net/bootsfaces/component/slider2/Slider2Renderer.java b/src/main/java/net/bootsfaces/component/slider2/Slider2Renderer.java index 3f5163c53..2a05d0217 100644 --- a/src/main/java/net/bootsfaces/component/slider2/Slider2Renderer.java +++ b/src/main/java/net/bootsfaces/component/slider2/Slider2Renderer.java @@ -248,7 +248,7 @@ private void encodeVLabel(Slider2 slider, ResponseWriter rw, String label) throw private void encodeInput(Slider2 slider, ResponseWriter rw, String mode, FacesContext context, int val, String clientId, boolean vo, int min, int max) throws IOException { - int cols = (vo ? 12 : 1); + int cols = (vo ? 12 : slider.getBadgeSpan()); if (!mode.equals("basic")) { /* * int span, int offset, int cxs, int csm, int clg, int oxs, int @@ -319,7 +319,7 @@ private void encodeSliderInput(Slider2 slider, ResponseWriter rw, boolean vo, in throws IOException { int cols = span; if (!slider.getMode().equals("basic")) { - cols--; + cols -= slider.getBadgeSpan(); } /* * int span, int offset, int cxs, int csm, int clg, int oxs, int osm, diff --git a/src/main/meta/META-INF/bootsfaces-b.taglib.xml b/src/main/meta/META-INF/bootsfaces-b.taglib.xml index 7fbdce711..65dffaf1b 100644 --- a/src/main/meta/META-INF/bootsfaces-b.taglib.xml +++ b/src/main/meta/META-INF/bootsfaces-b.taglib.xml @@ -18372,40 +18372,40 @@ net.bootsfaces.component.openStreetMap.OpenStreetMap - - center - true - java.lang.String + + attribution + false + String - - marker + + center false - java.lang.String + String - - popupMsg + + dragging false - java.lang.String + java.lang.Boolean - - zoom + + height false - java.lang.Integer + String - - width + + marker false - java.lang.String + String - - height + + maxZoom false - java.lang.String + java.lang.Integer @@ -18414,65 +18414,65 @@ java.lang.Integer - - maxZoom + + miniMap false - java.lang.Integer + java.lang.Boolean - - dragging + + miniMapHeight false - java.lang.Boolean + java.lang.Integer - - zoomControl + + miniMapPosition false - java.lang.Boolean + String - - zoomGlobal + + miniMapWidth false - java.lang.Boolean + java.lang.Integer - - attribution + + popupMsg false - java.lang.String + String - - miniMap + + urlTemplate false - java.lang.Boolean + String - - miniMapWidth + + width false - java.lang.Integer + String - - miniMapHeight + + zoom false java.lang.Integer - - miniMapPosition + + zoomControl false - java.lang.String + java.lang.Boolean - - urlTemplate + + zoomGlobal false - java.lang.String - + java.lang.Boolean + @@ -24243,6 +24243,18 @@ false java.lang.Boolean + + + badge-span + false + java.lang.Integer + + + + badgeSpan + false + java.lang.Integer + badge-style @@ -24497,6 +24509,18 @@ false java.lang.Boolean + + + badge-span + false + java.lang.Integer + + + + badgeSpan + false + java.lang.Integer + badge-style diff --git a/xtext/BootsFaces.jsfdsl b/xtext/BootsFaces.jsfdsl index 20076e567..93f6a1455 100644 --- a/xtext/BootsFaces.jsfdsl +++ b/xtext/BootsFaces.jsfdsl @@ -2165,6 +2165,7 @@ widget slider step Integer "The step of the slider." style "Inline style of the entire slider." style-class "Style class of the entire slider." + badge-span Integer default "1" "The column span of the badge or input field (if it's shown)." badge-style "Inline style of the badge or input field (if it's shown)." badge-style-class "Style class of the badge or input field (if it's shown)." value inherited "Value." @@ -2206,6 +2207,7 @@ widget slider2 value Integer default "5" inherited "Initial position of the slider." style "Inline style of the entire slider." style-class "Style class of the entire slider." + badge-span Integer default "1" "The column span of the badge or input field (if it's shown)." badge-style "Inline style of the badge or input field (if it's shown)." badge-style-class "Style class of the badge or input field (if it's shown)." }