Author: vmolotkov Date: 2007-11-12 12:01:39 -0500 (Mon, 12 Nov 2007) New Revision: 3931 Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx Log: support of disabled facets Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-12 16:41:20 UTC (rev 3930) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-12 17:01:39 UTC (rev 3931) @@ -18,9 +18,13 @@ import org.richfaces.component.Column; import org.richfaces.component.UIOrderingList; import org.richfaces.renderkit.html.images.OrderingListIconBottom; +import org.richfaces.renderkit.html.images.OrderingListIconBottomDisabled; import org.richfaces.renderkit.html.images.OrderingListIconDown; +import org.richfaces.renderkit.html.images.OrderingListIconDownDisabled; import org.richfaces.renderkit.html.images.OrderingListIconTop; +import org.richfaces.renderkit.html.images.OrderingListIconTopDisabled; import org.richfaces.renderkit.html.images.OrderingListIconUp; +import org.richfaces.renderkit.html.images.OrderingListIconUpDisabled; public abstract class OrderingListRendererBase extends AbstractRowsRenderer { @@ -38,6 +42,14 @@ private final static String FACET_DOWN = "downControl"; + private final static String FACET_DIS_TOP = "topControlDisabled"; + + private final static String FACET_DIS_BOTTOM = "bottomControlDisabled"; + + private final static String FACET_DIS_UP = "upControlDisabled"; + + private final static String FACET_DIS_DOWN = "downControlDisabled"; + private final static String FACET_CAPTION = "caption"; private final static String CONTROL_TYPE_LINK = "link"; @@ -62,6 +74,8 @@ private final static String ATTRIBUTE_CAPTION_LABEL = "captionLabel"; + private final static String DIS_CONTROL_ID_PREFIX = "dis"; + private final static String CONTROL_ID_UP = "up"; private final static String CONTROL_ID_DOWN = "down"; @@ -133,6 +147,14 @@ } }, + new ControlsHelper("disabledTop", "&#8607;", OrderingListIconTopDisabled.class.getName(), FACET_DIS_TOP, + "rich-ordering-control-disabled", DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_TOP), null) { + + public boolean isRendered(FacesContext context, UIOrderingList list) { + return list.isFastOrderControlsVisible(); + } + + }, new ControlsHelper("up", "&#8593;", OrderingListIconUp.class.getName(), FACET_UP, "rich-ordering-control-up", CONTROL_ID_UP, ATTRIBUTE_CE_ONUPCLICK) { @@ -141,6 +163,14 @@ } }, + new ControlsHelper("disabledUp", "&#8593;", OrderingListIconUpDisabled.class.getName(), FACET_DIS_UP, + "rich-ordering-control-disabled", DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_UP), null) { + + public boolean isRendered(FacesContext context, UIOrderingList list) { + return list.isOrderControlsVisible(); + } + + }, new ControlsHelper("down", "&#8595;", OrderingListIconDown.class.getName(), FACET_DOWN, "rich-ordering-control-down", CONTROL_ID_DOWN, ATTRIBUTE_CE_ONDOWNCLICK) { @@ -149,6 +179,14 @@ } }, + new ControlsHelper("disabledDown", "&#8595;", OrderingListIconDownDisabled.class.getName(), FACET_DIS_DOWN, + "rich-ordering-control-disabled", DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_DOWN), null) { + + public boolean isRendered(FacesContext context, UIOrderingList list) { + return list.isFastOrderControlsVisible(); + } + + }, new ControlsHelper("botton", "&#8609;", OrderingListIconBottom.class.getName(), FACET_BOTTOM, "rich-ordering-control-bottom", CONTROL_ID_BOTTOM, ATTRIBUTE_CE_ONBOTTOMCLICK) { @@ -156,6 +194,14 @@ return list.isOrderControlsVisible(); } + }, + new ControlsHelper("disabledBotton", "&#8609;", OrderingListIconBottomDisabled.class.getName(), FACET_DIS_BOTTOM, + "rich-ordering-control-disabled", DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_BOTTOM), null) { + + public boolean isRendered(FacesContext context, UIOrderingList list) { + return list.isOrderControlsVisible(); + } + } }; @@ -243,7 +289,10 @@ Map attributes = orderingList.getAttributes(); String controlType = (String) attributes.get(ATTRIBUTE_CONTROLS_TYPE); - String customEvent = (String) attributes.get(helper.customEvent); + String customEvent = null; + if (helper.customEvent != null) { + customEvent = (String) attributes.get(helper.customEvent); + } String htmlElem = null; if (CONTROL_TYPE_BUTTON.equals(controlType)) { Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss =================================================================== --- trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-12 16:41:20 UTC (rev 3930) +++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-12 17:01:39 UTC (rev 3931) @@ -121,10 +121,12 @@ } .ol_control_shown { - visibility: visible; + /*visibility: visible;*/ + display: block; } .ol_control_hidden { - visibility: hidden; + /*visibility: hidden;*/ + display: none; } .body { Modified: trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js =================================================================== --- trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js 2007-11-12 16:41:20 UTC (rev 3930) +++ trunk/sandbox/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/Control.js 2007-11-12 17:01:39 UTC (rev 3931) @@ -45,11 +45,11 @@ } Control.prototype.doHideNode = function(node) { - node.className = Control.CLASSES[this.action].hidden; + node.parentNode.className = Control.CLASSES[this.action].hidden; } Control.prototype.doShowNode = function(node) { - node.className = Control.CLASSES[this.action].shown; + node.parentNode.className = Control.CLASSES[this.action].shown; } Modified: trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx =================================================================== --- trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-12 16:41:20 UTC (rev 3930) +++ trunk/sandbox/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-11-12 17:01:39 UTC (rev 3931) @@ -54,10 +54,6 @@ <td class="ol_button_layout"> <f:call name="encodeControlsFacets"/> <f:clientId var="clientId"/> - <a id="#{clientId}disFirst" href="#">disabledTop</a><br/> - <a id="#{clientId}disUp" href="#">disUp</a><br/> - <a id="#{clientId}disDown" href="#">disDown</a><br/> - <a id="#{clientId}disLast" href="#">disBottom</a> </td> </tr> </tbody> @@ -76,7 +72,7 @@ document.body.onselectstart = function() {return false;}; document.body.className = "body"; function init() { - var cotrolsIdPrefix = [['up', 'disUp'], ['down', 'disDown'], ['last', 'disLast'], ['first','disFirst']]; + var cotrolsIdPrefix = [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']]; var shuttle = new Shuttle('#{cId}', '#{cId}internal_tab', '#{cId}internal_header_tab', '#{cId}focusKeeper', '#{cId}valueKeeper', cotrolsIdPrefix, '#{cId}sortLabel'); var layoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab'); layoutManager.widthSynchronization();