Author: nbelaevski Date: 2010-11-18 11:31:41 -0500 (Thu, 18 Nov 2010) New Revision: 20099 Removed: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanel.java Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js Log: https://jira.jboss.org/browse/RF-9715 Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js 2010-11-18 16:28:44 UTC (rev 20098) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js 2010-11-18 16:31:41 UTC (rev 20099) @@ -67,8 +67,8 @@ }); }, - __getHandle: function() { - return this.__rootElt.find(" > .rf-trn:first > .rf-trn-hnd:first"); + __getHandles: function() { + return this.__rootElt.find(" > .rf-trn:first > .rf-trn-hnd"); }, __getContent: function() { @@ -163,11 +163,19 @@ switch (tree.getToggleType()) { case 'client': this.__rootElt.addClass(TREE_CLASSES[newState ? 1 : 0]).removeClass(TREE_CLASSES[!newState ? 1 : 0]); +<<<<<<< HEAD this.__getHandle().addClass(TREE_HANDLE_CLASSES[newState ? 1 : 0]).removeClass(TREE_HANDLE_CLASSES[!newState ? 1 : 0]); var icons = this.__getIcons(); if (icons.length == 1) { icons.addClass(TREE_ICON_CLASSES[newState ? 1 : 0]).removeClass(TREE_ICON_CLASSES[!newState ? 1 : 0]); +======= + + var handles = this.__getHandles(); + + if (handles.length == 1) { + handles.addClass(TREE_HANDLE_CLASSES[newState ? 1 : 0]).removeClass(TREE_HANDLE_CLASSES[!newState ? 1 : 0]); +>>>>>>> https://jira.jboss.org/browse/RF-9715 } this.__updateClientToggleStateInput(newState); Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanel.java 2010-11-18 16:28:44 UTC (rev 20098) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanel.java 2010-11-18 16:31:41 UTC (rev 20099) @@ -1,49 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.richfaces.component; - -import javax.faces.component.UIComponentBase; - -import org.richfaces.cdk.annotations.JsfComponent; -import org.richfaces.cdk.annotations.JsfRenderer; -import org.richfaces.cdk.annotations.Tag; -import org.richfaces.cdk.annotations.TagType; - -/** - * JSF component class - * - */ -@JsfComponent(tag = @Tag(type = TagType.Facelets), - renderer = @JsfRenderer(type = "org.richfaces.PanelRenderer") - ) -public class UIPanel extends UIComponentBase { - private static final String COMPONENT_FAMILY = "org.richfaces.Panel"; - - public boolean getRendersChildren() { - return true; - } - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } -}