Author: Alex.Kolonitsky
Date: 2009-09-03 10:38:00 -0400 (Thu, 03 Sep 2009)
New Revision: 15451
Modified:
branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
Log:
SimpleTogglePanel generates empty display/height/width style attribute
https://jira.jboss.org/jira/browse/RF-7518
Modified:
branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
===================================================================
---
branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2009-09-03
13:00:58 UTC (rev 15450)
+++
branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2009-09-03
14:38:00 UTC (rev 15451)
@@ -248,6 +248,36 @@
}
}
+ public void encodeSwitchOnDivStart(ResponseWriter writer,
+ FacesContext context, UISimpleTogglePanel component) throws IOException {
+ encodeSwitchDivStart(writer, context, component, true);
+ }
+
+ public void encodeSwitchOffDivStart(ResponseWriter writer,
+ FacesContext context, UISimpleTogglePanel component) throws IOException {
+ encodeSwitchDivStart(writer, context, component, false);
+ }
+
+ private void encodeSwitchDivStart(ResponseWriter writer,
+ FacesContext context, UISimpleTogglePanel component, boolean isSwitchOn)
+ throws IOException {
+ String clientId = component.getClientId(context);
+ writer.startElement("div", component);
+
+ getUtils().writeAttribute(writer, "class",
"rich-stglpnl-marker" );
+ getUtils().writeAttribute(writer, "id", convertToString(clientId) +
"_switch_" + (isSwitchOn ? "on" : "off"));
+
+ String display = convertToString(getSwitchStatus(context, component,
isSwitchOn)).trim();
+ if (!isEmpty(display)) {
+ display = "display: " + display;
+ }
+ getUtils().writeAttribute(writer, "style", display);
+ }
+
+ public String getSwitchStatus(FacesContext context, UIComponent component, boolean
isSwitchOn) {
+ return ((UISimpleTogglePanel) component).isOpened() ^ isSwitchOn ? EMPTY : NONE;
+ }
+
private boolean isEmpty(String str) {
return str == null || str.length() == 0;
}
@@ -259,25 +289,4 @@
public void encodeDivEnd(ResponseWriter writer) throws IOException {
writer.endElement("div");
}
-
- public String getSwitchOnStatus(FacesContext context, UIComponent component) {
- UISimpleTogglePanel simpleTogglePanel = (UISimpleTogglePanel) component;
- return simpleTogglePanel.isOpened() ? EMPTY : NONE;
-// String sw = Boolean.toString(((UISimpleTogglePanel) component).isOpened());
-// if (sw == null || sw.equals(Boolean.toString(UISimpleTogglePanel.EXPANDED)))
-// return EMPTY;
-// else return NONE;
- }
-
- public String getSwitchOffStatus(FacesContext context, UIComponent component) {
- UISimpleTogglePanel simpleTogglePanel = (UISimpleTogglePanel) component;
- return simpleTogglePanel.isOpened() ? NONE : EMPTY ;
-
-// String sw = Boolean.toString(((UISimpleTogglePanel) component).isOpened());
-// if (sw == null || sw.equals(Boolean.toString(UISimpleTogglePanel.EXPANDED)))
-// return NONE;
-// else return EMPTY;
-
- }
-
}
Modified:
branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
===================================================================
---
branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2009-09-03
13:00:58 UTC (rev 15450)
+++
branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2009-09-03
14:38:00 UTC (rev 15451)
@@ -39,7 +39,9 @@
onclick="#{this:getOnClick(context,component)}">
<div class="rich-stglpanel-marker">
- <div id="#{clientId}_switch_on" style="display:
#{this:getSwitchOnStatus(context, component)};"
class="rich-stglpnl-marker">
+ <jsp:scriptlet>
+ encodeSwitchOnDivStart(writer, context, component);
+ </jsp:scriptlet>
<jsp:scriptlet><![CDATA[
if(component.getFacet("closeMarker")!=null &&
component.getFacet("closeMarker").isRendered()) {
]]></jsp:scriptlet>
@@ -49,9 +51,11 @@
writer.write("«");
}
]]></jsp:scriptlet>
- </div>
- <div id="#{clientId}_switch_off"
- style="display: #{this:getSwitchOffStatus(context,
component)};" class="rich-stglpnl-marker">
+ <jsp:scriptlet>
+ encodeDivEnd(writer);
+
+ encodeSwitchOffDivStart(writer, context, component);
+ </jsp:scriptlet>
<jsp:scriptlet><![CDATA[
if(component.getFacet("openMarker")!=null &&
component.getFacet("openMarker").isRendered()) {
]]></jsp:scriptlet>
@@ -61,7 +65,9 @@
writer.write("»");
}
]]></jsp:scriptlet>
- </div>
+ <jsp:scriptlet>
+ encodeDivEnd(writer);
+ </jsp:scriptlet>
</div>
<jsp:scriptlet><![CDATA[