JBoss Rich Faces SVN: r2207 - trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-10 15:22:16 -0400 (Fri, 10 Aug 2007)
New Revision: 2207
Modified:
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
Log:
http://jira.jboss.com/jira/browse/RF-582 fixed
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2007-08-10 17:29:41 UTC (rev 2206)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2007-08-10 19:22:16 UTC (rev 2207)
@@ -53,12 +53,22 @@
}
},
- processPreventLostFocus: function() {
+ processPreventLostFocus: function(event) {
+ // RF-582 fix
+ if (Richfaces.eventIsSynthetic(event)) {
+ return ;
+ }
+
this.inFocus = true;
this.preventLostFocus = true;
},
- processLostFocus: function() {
+ processLostFocus: function(event) {
+ // RF-582 fix
+ if (Richfaces.eventIsSynthetic(event)) {
+ return ;
+ }
+
if (!this.preventLostFocus) {
this.lostFocus();
} else {
18 years, 9 months
JBoss Rich Faces SVN: r2206 - in trunk: ui/insert and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-10 13:29:41 -0400 (Fri, 10 Aug 2007)
New Revision: 2206
Modified:
trunk/test-applications/pom.xml
trunk/ui/insert/
Log:
- test-applications/pom.xml version changed to snapshot
- insert service files svn:ignored
Modified: trunk/test-applications/pom.xml
===================================================================
--- trunk/test-applications/pom.xml 2007-08-10 17:26:28 UTC (rev 2205)
+++ trunk/test-applications/pom.xml 2007-08-10 17:29:41 UTC (rev 2206)
@@ -51,7 +51,7 @@
<dependency>
<artifactId>richfaces-ui</artifactId>
<groupId>org.richfaces.ui</groupId>
- <version>3.1.0-rc1</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Property changes on: trunk/ui/insert
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
18 years, 9 months
JBoss Rich Faces SVN: r2205 - in trunk: framework/impl/src/main/java/org/richfaces/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-10 13:26:28 -0400 (Fri, 10 Aug 2007)
New Revision: 2205
Added:
trunk/framework/api/src/main/java/org/richfaces/component/TemplateComponent.java
Modified:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java
trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
Log:
- TemplateComponent class added
- Handling for TemplateComponent in Calendar component added
- Test case updated
Added: trunk/framework/api/src/main/java/org/richfaces/component/TemplateComponent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/component/TemplateComponent.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/component/TemplateComponent.java 2007-08-10 17:26:28 UTC (rev 2205)
@@ -0,0 +1,18 @@
+/**
+ *
+ */
+package org.richfaces.component;
+
+/**
+ * @author Nick Belaevski
+ * mailto:nbelaevski@exadel.com
+ * created 10.08.2007
+ *
+ */
+public interface TemplateComponent {
+ public static final String TEMPLATE_CLIENT_ID = "{componentId}";
+
+ public void startTemplateEncode();
+
+ public void endTemplateEncode();
+}
Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2007-08-10 16:13:35 UTC (rev 2204)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2007-08-10 17:26:28 UTC (rev 2205)
@@ -23,6 +23,7 @@
import org.ajax4jsf.webapp.tidy.TidyParser;
import org.ajax4jsf.webapp.tidy.TidyXMLFilter;
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
+import org.richfaces.component.TemplateComponent;
import org.richfaces.json.JSContentHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -99,13 +100,27 @@
StringWriter dumpingWriter = new StringWriter();
ResponseWriter clonedWriter = writer.cloneWithWriter(dumpingWriter);
context.setResponseWriter(clonedWriter);
+
+ TemplateComponent templateComponent = null;
+ if (component instanceof TemplateComponent) {
+ templateComponent = (TemplateComponent) component;
+ }
+
try {
+ if (templateComponent != null) {
+ templateComponent.startTemplateEncode();
+ }
+
if (children) {
this.renderChildren(context, component);
} else {
this.renderChild(context, component);
}
} finally {
+ if (templateComponent != null) {
+ templateComponent.endTemplateEncode();
+ }
+
clonedWriter.flush();
context.setResponseWriter(writer);
}
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-10 16:13:35 UTC (rev 2204)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-10 17:26:28 UTC (rev 2205)
@@ -50,7 +50,7 @@
<f:validator validatorId="org.richfaces.CalendarValidator" />
- <h:panelGrid columns="2">
+ <h:panelGrid columns="2" id="dayTable">
<f:verbatim><p style="padding: 2px;" <%-- class="largeText"--%>>{day}</p></f:verbatim>
<%-- h:panelGrid>
<h:outputText styleClass="smallText" value="{data.enLabel}" />
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-10 16:13:35 UTC (rev 2204)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-10 17:26:28 UTC (rev 2205)
@@ -32,6 +32,8 @@
import java.util.TimeZone;
import javax.faces.application.FacesMessage;
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
@@ -57,7 +59,7 @@
* JSF component class
*
*/
-public abstract class UICalendar extends UIInput {
+public abstract class UICalendar extends UIInput implements TemplateComponent, NamingContainer {
public static final String COMPONENT_TYPE = "org.richfaces.Calendar";
@@ -279,6 +281,31 @@
}
+ private transient boolean inTemplateEncode = false;
+
+ public void startTemplateEncode() {
+ if (getChildCount() > 0) {
+ Iterator children = getChildren().iterator();
+ while (children.hasNext()) {
+ UIComponent child = (UIComponent) children.next();
+ child.setId(child.getId());
+ }
+ }
+ inTemplateEncode = true;
+ }
+
+ public void endTemplateEncode() {
+ inTemplateEncode = false;
+ }
+
+ public String getClientId(FacesContext context) {
+ if (inTemplateEncode) {
+ return TemplateComponent.TEMPLATE_CLIENT_ID;
+ } else {
+ return super.getClientId(context);
+ }
+ }
+
public void broadcast(FacesEvent event) throws AbortProcessingException {
// TODO Auto-generated method stub
if (event instanceof AjaxEvent) {
18 years, 9 months
JBoss Rich Faces SVN: r2204 - in trunk/ui/tabPanel/src: main/java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-10 12:13:35 -0400 (Fri, 10 Aug 2007)
New Revision: 2204
Modified:
trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java
trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java
trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabPanelTest.java
trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java
Log:
http://jira.jboss.com/jira/browse/RF-560 fix for JSF 1.2
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-08-10 16:11:08 UTC (rev 2203)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITab.java 2007-08-10 16:13:35 UTC (rev 2204)
@@ -21,19 +21,19 @@
package org.richfaces.component;
-import org.ajax4jsf.component.AjaxActionComponent;
-import org.ajax4jsf.component.AjaxComponent;
-import org.ajax4jsf.event.AjaxSource;
-import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import java.io.IOException;
import javax.faces.FacesException;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.faces.render.Renderer;
-import java.io.IOException;
+import org.ajax4jsf.component.AjaxActionComponent;
+import org.ajax4jsf.component.AjaxComponent;
+import org.ajax4jsf.event.AjaxSource;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
+
/**
* Base class for panel tab.
*
@@ -47,8 +47,6 @@
private transient boolean _active = false;
- private String switchType;
-
/**
* @param context
* @param active
@@ -146,45 +144,22 @@
/* public abstract String getDescription();
public abstract void setDescription(String newvalue);*/
- public String getSwitchType() {
- if (this.switchType != null) {
- return this.switchType;
- }
-
- ValueBinding valueBinding = getValueBinding("switchType");
- if (valueBinding != null) {
- return (String) valueBinding.getValue(
- FacesContext.getCurrentInstance());
- }
-
- UITabPanel pane = getPane();
- if (pane != null) {
- return getPane().getSwitchType();
- }
-
+ public String getSwitchTypeOrDefault() {
+ String switchType = getSwitchType();
+ if (switchType == null) {
+ switchType = getPane().getSwitchType();
+ }
+
+ if (switchType != null) {
+ return switchType;
+ }
+
return UISwitchablePanel.DEFAULT_METHOD;
}
+
+ public abstract String getSwitchType();
+ public abstract void setSwitchType(String newvalue);
- public void setSwitchType(String newvalue) {
- this.switchType = newvalue;
- }
-
- public Object saveState(FacesContext context) {
- Object[] state = new Object[2];
- state[0] = super.saveState(context);
-
- state[1] = switchType;
-
- return state;
- }
-
- public void restoreState(FacesContext context, Object object) {
- Object[] state = (Object[]) object;
- super.restoreState(context, state[0]);
-
- this.switchType = (String) state[1];
- }
-
//TODO - nick - ?
// public void processDecodes(FacesContext context) {
//
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-08-10 16:11:08 UTC (rev 2203)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-08-10 16:13:35 UTC (rev 2204)
@@ -43,7 +43,7 @@
return new TabsIterator(this, new TabsIterator.FilterCondition() {
public boolean isSuitable(UITab tab) {
- if (CLIENT_METHOD.equals(tab.getSwitchType())) {
+ if (CLIENT_METHOD.equals(tab.getSwitchTypeOrDefault())) {
return true;
}
@@ -82,9 +82,19 @@
return selectedTab;
}
+ Object localValue = getLocalValue();
+ if (localValue != null) {
+ return localValue;
+ }
+
//do not use VB for selectedTab here, because it'll be returned for "value" VB queue
//see UITabPanel#getValueBinding(String) for more
- return super.getValue();
+ ValueBinding vb = getValueBinding("value");
+ if (vb != null) {
+ return vb.getValue(getFacesContext());
+ }
+
+ return null;
}
public void setValue(Object value) {
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-08-10 16:11:08 UTC (rev 2203)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-08-10 16:13:35 UTC (rev 2204)
@@ -54,7 +54,7 @@
boolean disabled = tab.isDisabled();
UITabPanel pane = tab.getPane();
- String method = tab.getSwitchType();
+ String method = tab.getSwitchTypeOrDefault();
boolean ajax = UISwitchablePanel.AJAX_METHOD.equals(method);
boolean clientSide = UISwitchablePanel.CLIENT_METHOD.equals(method);
String label = tab.getLabel();
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-08-10 16:11:08 UTC (rev 2203)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-08-10 16:13:35 UTC (rev 2204)
@@ -21,6 +21,16 @@
package org.richfaces.renderkit;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
import org.ajax4jsf.event.AjaxEvent;
import org.ajax4jsf.javascript.JSReference;
import org.ajax4jsf.javascript.ScriptUtils;
@@ -34,16 +44,7 @@
import org.richfaces.component.util.HtmlUtil;
import org.richfaces.event.SwitchablePanelSwitchEvent;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
* created 12.01.2007
@@ -89,7 +90,7 @@
new SwitchablePanelSwitchEvent(panel, null, eventTab).queue();
new ActionEvent(eventTab).queue();
- if (UISwitchablePanel.AJAX_METHOD.equals(eventTab.getSwitchType()))
+ if (UISwitchablePanel.AJAX_METHOD.equals(eventTab.getSwitchTypeOrDefault()))
{
new AjaxEvent(eventTab).queue();
}
@@ -226,10 +227,7 @@
public void encodeTabs(FacesContext context, UITabPanel tabPanel) throws IOException {
ComponentVariables componentVariables = ComponentsVariableResolver.getVariables(this, tabPanel);
- Object checkedValue = checkValue(tabPanel.getSelectedTab());
- if (checkedValue == null) {
- checkedValue = checkValue(tabPanel.getValue());
- }
+ Object checkedValue = checkValue(tabPanel.getValue());
boolean useFirstRenderedTab = checkedValue == null;
UITabPanel pane = tabPanel;
@@ -286,7 +284,7 @@
if (tab.isRendered()) {
if (!clientSide) {
- clientSide = UISwitchablePanel.CLIENT_METHOD.equals(tab.getSwitchType());
+ clientSide = UISwitchablePanel.CLIENT_METHOD.equals(tab.getSwitchTypeOrDefault());
}
tab.encodeTab(context, active);
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java 2007-08-10 16:11:08 UTC (rev 2203)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java 2007-08-10 16:13:35 UTC (rev 2204)
@@ -83,7 +83,7 @@
}
protected boolean shouldRenderTab(UITab tab) {
- String method = tab.getSwitchType();
+ String method = tab.getSwitchTypeOrDefault();
return (tab.isActive() || UISwitchablePanel.CLIENT_METHOD.equals(method));
}
Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabPanelTest.java
===================================================================
--- trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabPanelTest.java 2007-08-10 16:11:08 UTC (rev 2203)
+++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabPanelTest.java 2007-08-10 16:13:35 UTC (rev 2204)
@@ -102,7 +102,9 @@
tab3.setSwitchType(UISwitchablePanel.SERVER_METHOD);
tabPanel.setRenderedValue(tab3.getName());
-
+ Object state = tabPanel.saveState(facesContext);
+ tabPanel.restoreState(facesContext, state);
+
Iterator it = tabPanel.getSwitchedFacetsAndChildren();
assertEquals(tab3.getId(), ((UITab)it.next()).getId());
}
Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java
===================================================================
--- trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java 2007-08-10 16:11:08 UTC (rev 2203)
+++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java 2007-08-10 16:13:35 UTC (rev 2204)
@@ -21,13 +21,14 @@
package org.richfaces.component;
-import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-
+import javax.faces.FacesException;
import javax.faces.component.UIForm;
import javax.faces.component.html.HtmlForm;
import javax.faces.context.FacesContext;
import javax.faces.render.Renderer;
+import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+
/**
* Unit test for UITab.
*/
@@ -75,15 +76,27 @@
}
public void testGetPane1() throws Exception {
- assertNull(tab.getPane());
+ try {
+ tab.getPane();
+
+ fail();
+ } catch (FacesException e) {
+ }
+
tabPanel.getChildren().add(tab);
assertTrue(tab.getPane() instanceof UITabPanel);
}
public void testGetPane2() throws Exception {
- assertNull(tab.getPane());
+ try {
+ tab.getPane();
+
+ fail();
+ } catch (FacesException e) {
+ }
+
form.getChildren().add(tab);
try {
@@ -248,5 +261,12 @@
public void setFocus(String arg0) {
}
+
+ public String getSwitchType() {
+ return null;
+ }
+
+ public void setSwitchType(String newvalue) {
+ }
}
}
18 years, 9 months
JBoss Rich Faces SVN: r2203 - trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-08-10 12:11:08 -0400 (Fri, 10 Aug 2007)
New Revision: 2203
Modified:
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
Log:
$ optimization
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js 2007-08-10 14:23:52 UTC (rev 2202)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item-dnd.js 2007-08-10 16:11:08 UTC (rev 2203)
@@ -54,7 +54,7 @@
},
getDropzoneOptions: function() {
- var attr = Richfaces.getNSAttribute("dropzoneoptions", this.elements.icon);
+ var attr = Richfaces.getNSAttribute("dropzoneoptions", $(this.elementID.icon));
if (attr) {
return attr.parseJSON();
}
@@ -105,7 +105,7 @@
},
getDraggableOptions: function() {
- var attr = Richfaces.getNSAttribute("draggableoptions", this.elements.icon);
+ var attr = Richfaces.getNSAttribute("draggableoptions", $(this.elementID.icon));
if (attr) {
return attr.parseJSON();
}
@@ -124,6 +124,6 @@
getElement: function() {
//returns <tr> holding node without children
- return this.elements.text.parentNode;
+ return $(this.elementID.text).parentNode;
}
});
\ No newline at end of file
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2007-08-10 14:23:52 UTC (rev 2202)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2007-08-10 16:11:08 UTC (rev 2203)
@@ -5,9 +5,20 @@
this.parent = parent;
this.id = id;
this.switchType = switchType;
- this.tree = $(tree);
+ this.tree = tree;
this.elements = {};
- //($(id)).object = this; //dublicate: see getElements()
+ this.elementID = {};
+
+ this.elementID.children = this.id + Tree.ID_DEVIDER + Tree.ID_CHILDS_ROW;
+ this.elementID.mainRow = this.id + Tree.ID_DEVIDER + Tree.ID_MAIN_ROW;
+ this.elementID.handle = this.id + Tree.ID_DEVIDER + Tree.ID_HANDLE;
+ this.elementID.handleImgExpanded = this.elementID.handle + Tree.ID_DEVIDER + Tree.ID_HANDLE_IMG_EXPANDED;
+ this.elementID.handleImgCollapsed = this.elementID.handle + Tree.ID_DEVIDER + Tree.ID_HANDLE_IMG_COLLAPSED;
+ this.elementID.icon = this.id + Tree.ID_DEVIDER + Tree.ID_ICON;
+ this.elementID.text = this.id + Tree.ID_DEVIDER + Tree.ID_TEXT;
+
+ ($(this.id)).object = this;
+
this.toggleOnClick = toggleOnClick;
this.getElements();
@@ -23,55 +34,56 @@
},
observeEvents: function() {
- Event.observe(this.elements.icon, "mousedown", this.eventSelectionClick);
- Event.observe(this.elements.text, "mousedown", this.eventSelectionClick);
- Event.observe(this.elements.icon, "mouseout", this.eventMouseOut);
- Event.observe(this.elements.text, "mouseout", this.eventMouseOut);
- Event.observe(this.elements.icon, "mouseover", this.eventMouseOver);
- Event.observe(this.elements.text, "mouseover", this.eventMouseOver);
+ var eIcon = $(this.elementID.icon);
+ var eText = $(this.elementID.text);
+ if (eIcon) {
+ Event.observe(eIcon, "mousedown", this.eventSelectionClick);
+ Event.observe(eIcon, "mouseout", this.eventMouseOut);
+ Event.observe(eIcon, "mouseover", this.eventMouseOver);
+ if (this.eventRightClick) {
+ eIcon.oncontextmenu = this.eventRightClick;
+ }
+ }
+ if (eText)
+ {
+ Event.observe(eText, "mousedown", this.eventSelectionClick);
+ Event.observe(eText, "mouseout", this.eventMouseOut);
+ Event.observe(eText, "mouseover", this.eventMouseOver);
+ if (this.eventRightClick) {
+ eText.oncontextmenu = this.eventRightClick;
+ }
+ }
if (this.switchType=="client" && this.childs.length > 0) {
this.eventCollapsionClick = this.toggleCollapsion.bindAsEventListener(this);
if (this.toggleOnClick) {
- if (this.elements.mainRow)
- Event.observe(this.elements.mainRow, "click", this.eventCollapsionClick);
+ Event.observe(this.elementID.mainRow, "click", this.eventCollapsionClick);
} else {
- if (this.elements.handle)
- Event.observe(this.elements.handle, "click", this.eventCollapsionClick);
+ //if (this.elements.handle)
+ Event.observe(this.elementID.handle, "click", this.eventCollapsionClick);
}
}
-
- if (this.eventRightClick) {
- this.elements.icon.oncontextmenu = this.eventRightClick;
- this.elements.text.oncontextmenu = this.eventRightClick;
- }
},
getElements: function() {
- ($(this.id)).object = this;
- this.nodeStateInput = $(this.id + "NodeExpanded");
+
this.childs = [];
- var childsRowId = this.id + Tree.ID_DEVIDER + Tree.ID_CHILDS_ROW;
- var mainRowId = this.id + Tree.ID_DEVIDER + Tree.ID_MAIN_ROW;
- this.elements.row = $(childsRowId);
- var handleId = this.id + Tree.ID_DEVIDER + Tree.ID_HANDLE;
- this.elements.handle = $(handleId);
- this.elements.handleImgExpanded = $(handleId + Tree.ID_DEVIDER + Tree.ID_HANDLE_IMG_EXPANDED);
- this.elements.handleImgCollapsed = $(handleId + Tree.ID_DEVIDER + Tree.ID_HANDLE_IMG_COLLAPSED);
- this.elements.icon = $(this.id + Tree.ID_DEVIDER + Tree.ID_ICON);
- this.elements.text = $(this.id + Tree.ID_DEVIDER + Tree.ID_TEXT);
- var contextMenu = Richfaces.getNSAttribute("oncontextmenu", this.elements.icon);
+ var contextMenu = Richfaces.getNSAttribute("oncontextmenu", $(this.elementID.icon));
if (contextMenu && contextMenu.length > 0) {
this.onContextMenu = new Function(contextMenu + "; return true;");
}
-
- var childsTd = $(childsRowId/* + Tree.ID_DEVIDER + Tree.ID_CHILDS_TD*/);
+
+ var childsTd = $(this.elementID.children);
+
if (childsTd) {
- for(var child = childsTd.firstChild; child != null; child = child.nextSibling ) {
+ var child = childsTd.firstChild;
+ while ( child != null )
+ {
if (child.nodeType == 1 && child.tagName.toLowerCase() == "table") {
this.addChild(new Tree.Item(child.id, this.tree, this, this.childs.length, this.switchType, this.toggleOnClick));
}
+ child = child.nextSibling;
}
/*
for (var i = 0; i < childsTd.childNodes.length; i++) {
@@ -82,8 +94,6 @@
}
*/
}
-
- this.elements.mainRow = $(mainRowId);
},
addChild: function(child) {
@@ -109,37 +119,43 @@
toggleCollapsion: function() {
- if (this.hasChilds()) Element.toggle(this.elements.row);
+ var row=this.id + Tree.ID_DEVIDER + Tree.ID_CHILDS_ROW;
+ if (this.hasChilds()) Element.toggle(row);
// Rerender main row to avoid bad representation in Opera and Konqueror/Safari
- if (this.elements.mainRow) {
- Element.hide(this.elements.mainRow);
- Element.show(this.elements.mainRow);
+ var e = $(this.elementID.mainRow)
+ if (e) {
+ Element.hide(e);
+ Element.show(e);
}
+
+ var nodeStateInput = $(this.id + "NodeExpanded");
+ var eIcon = $(this.elementID.icon);
+
if (this.isCollapsed()) {
- this.elements.handleImgExpanded.style.display="none";
- this.elements.handleImgCollapsed.style.display="";
- if(Element.hasClassName(this.elements.icon, Tree.CLASS_ITEM_EXPANDED)) {
- Element.removeClassName(this.elements.icon, Tree.CLASS_ITEM_EXPANDED);
- Element.addClassName(this.elements.icon, Tree.CLASS_ITEM_COLLAPSED);
+ Element.hide(this.elementID.handleImgExpanded);
+ Element.show(this.elementID.handleImgCollapsed);
+ if( eIcon && Element.hasClassName(eIcon, Tree.CLASS_ITEM_EXPANDED)) {
+ Element.removeClassName(eIcon, Tree.CLASS_ITEM_EXPANDED);
+ Element.addClassName(eIcon, Tree.CLASS_ITEM_COLLAPSED);
}
- if (this.nodeStateInput) {
- this.nodeStateInput.value = "false";
+ if (nodeStateInput) {
+ nodeStateInput.value = "false";
}
this.fireCollapsionEvent();
} else {
- this.elements.handleImgExpanded.style.display="";
- this.elements.handleImgCollapsed.style.display="none";
- if(Element.hasClassName(this.elements.icon, Tree.CLASS_ITEM_COLLAPSED)) {
- Element.removeClassName(this.elements.icon, Tree.CLASS_ITEM_COLLAPSED);
- Element.addClassName(this.elements.icon, Tree.CLASS_ITEM_EXPANDED);
+ Element.show(this.elementID.handleImgExpanded);
+ Element.hide(this.elementID.handleImgCollapsed);
+ if(eIcon && Element.hasClassName(eIcon, Tree.CLASS_ITEM_COLLAPSED)) {
+ Element.removeClassName(eIcon, Tree.CLASS_ITEM_COLLAPSED);
+ Element.addClassName(eIcon, Tree.CLASS_ITEM_EXPANDED);
}
- if (this.nodeStateInput) {
- this.nodeStateInput.value = "true";
+ if (nodeStateInput) {
+ nodeStateInput.value = "true";
}
this.fireExpansionEvent();
@@ -148,26 +164,29 @@
},
getRichAttribute: function(name) {
- return Richfaces.getNSAttribute(name, this.elements.icon);
+ return Richfaces.getNSAttribute(name, $(this.elementID.icon));
},
collapse: function() {
if (!this.isCollapsed() && this.switchType!="client") {
if (this.toggleOnClick) {
- if (this.elements.mainRow)
- this.elements.mainRow.onclick();
+ var e = $(this.elementID.mainRow);
+ if (e)
+ e.onclick();
} else {
- if (this.elements.handle)
- this.elements.handle.onclick();
+ var e = $(this.elementID.handle);
+ if (e)
+ e.onclick();
}
}
if (this.hasChilds() && !this.isCollapsed()) {
- Element.hide(this.elements.row);
- this.elements.handleImgExpanded.style.display="none";
- this.elements.handleImgCollapsed.style.display="";
- if(Element.hasClassName(this.elements.icon, Tree.CLASS_ITEM_EXPANDED)) {
- Element.removeClassName(this.elements.icon, Tree.CLASS_ITEM_EXPANDED);
- Element.addClassName(this.elements.icon, Tree.CLASS_ITEM_COLLAPSED);
+ Element.hide(this.elementID.children);
+ Element.hide(this.elementID.handleImgExpanded);
+ Element.show(this.elementID.handleImgCollapsed);
+ var eIcon = $(this.elementID.icon);
+ if(eIcon && Element.hasClassName(eIcon, Tree.CLASS_ITEM_EXPANDED)) {
+ Element.removeClassName(eIcon, Tree.CLASS_ITEM_EXPANDED);
+ Element.addClassName(eIcon, Tree.CLASS_ITEM_COLLAPSED);
}
}
@@ -177,20 +196,23 @@
expand: function() {
if (this.isCollapsed() && this.switchType!="client") {
if (this.toggleOnClick) {
- if (this.elements.mainRow)
- this.elements.mainRow.onclick();
+ var e = $(this.elementID.mainRow);
+ if (e)
+ e.onclick();
} else {
- if (this.elements.handle)
- this.elements.handle.onclick();
+ var e = $(this.elementID.handle);
+ if (e)
+ e.onclick();
}
}
if (this.hasChilds() && this.isCollapsed()) {
- Element.show(this.elements.row);
- this.elements.handleImgExpanded.style.display="";
- this.elements.handleImgCollapsed.style.display="none";
- if(Element.hasClassName(this.elements.icon, Tree.CLASS_ITEM_COLLAPSED)) {
- Element.removeClassName(this.elements.icon, Tree.CLASS_ITEM_COLLAPSED);
- Element.addClassName(this.elements.icon, Tree.CLASS_ITEM_EXPANDED);
+ Element.show(this.elementID.children);
+ Element.show(this.elementID.handleImgExpanded);
+ Element.hide(this.elementID.handleImgCollapsed);
+ var eIcon = $(this.elementID.icon);
+ if(eIcon && Element.hasClassName(eIcon, Tree.CLASS_ITEM_COLLAPSED)) {
+ Element.removeClassName(eIcon, Tree.CLASS_ITEM_COLLAPSED);
+ Element.addClassName(eIcon, Tree.CLASS_ITEM_EXPANDED);
}
}
@@ -198,8 +220,9 @@
},
isCollapsed: function() {
- if (this.elements.row != null) {
- return this.elements.row.style.display == "none";
+ var e = $(this.elementID.children);
+ if (e) {
+ return e.style.display == "none";
} else {
return true;
}
@@ -208,11 +231,12 @@
processMouseOut: function(e) {
if (this.isMouseIn) {
this.isMouseIn = false;
- var hClass = Richfaces.getNSAttribute("highlightedclass", this.elements.text);
+ var eText = $(this.elementID.text);
+ var hClass = Richfaces.getNSAttribute("highlightedclass", eText);
if (hClass) {
var classNames = hClass.split(' ')
for (var i = 0; i < classNames.length; i++) {
- Element.removeClassName(this.elements.text, classNames[i]);
+ Element.removeClassName(eText, classNames[i]);
}
if (window.drag){
this.dragLeave(e);
@@ -224,11 +248,12 @@
processMouseOver: function(e) {
if(!this.isMouseIn) {
this.isMouseIn = true;
- var hClass = Richfaces.getNSAttribute("highlightedclass", this.elements.text);
+ var eText = $(this.elementID.text);
+ var hClass = Richfaces.getNSAttribute("highlightedclass", eText);
if (hClass) {
var classNames = hClass.split(' ')
for (var i = 0; i < classNames.length; i++) {
- Element.addClassName(this.elements.text, classNames[i]);
+ Element.addClassName(eText, classNames[i]);
}
if (window.drag) {
this.dragEnter(e);
@@ -274,19 +299,20 @@
alert(s);
*/
-
- var sClass = Richfaces.getNSAttribute("selectedclass", this.elements.text);
+
+ var eText = $(this.elementID.text);
+ var sClass = Richfaces.getNSAttribute("selectedclass", eText);
if (sClass) {
var classNames = sClass.split(' ')
for (var i = 0; i < classNames.length; i++) {
- Element.addClassName(this.elements.text, classNames[i]);
+ Element.addClassName(eText, classNames[i]);
}
this.tree.input.value = this.id;
this.tree.selectionManager.activeItem = this;
if (this.tree.options.onSelection) this.tree.options.onSelection(this.id);
- this.tree.showNode(this.elements.text.parentNode);
+ this.tree.showNode(eText.parentNode);
if (e && e["originatingEventType"] == "mousedown" /* can be keydown */) {
this.startDrag(e);
@@ -298,15 +324,16 @@
},
isSelected: function() {
- return Element.hasClassName(this.elements.text, Tree.CLASS_ITEM_SELECTED);
+ return Element.hasClassName(this.elementID.text, Tree.CLASS_ITEM_SELECTED);
},
deselect: function() {
- var sClass = Richfaces.getNSAttribute("selectedclass", this.elements.text);
+ var eText = $(this.elementID.text);
+ var sClass = Richfaces.getNSAttribute("selectedclass", eText);
if (sClass) {
var classNames = sClass.split(' ')
for (var i = 0; i < classNames.length; i++) {
- Element.removeClassName(this.elements.text, classNames[i]);
+ Element.removeClassName(eText, classNames[i]);
}
}
},
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2007-08-10 14:23:52 UTC (rev 2202)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2007-08-10 16:11:08 UTC (rev 2203)
@@ -46,10 +46,11 @@
},
restoreSelection: function() {
- var e = $(this.tree.input.value);
- if (this.tree.input.value && e) {
- this.setSelection((e).object);
- }
+ if (this.tree.input.value)
+ {
+ var e = $(this.tree.input.value);
+ if (e) this.setSelection(e.object);
+ }
},
processPreventLostFocus: function() {
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-08-10 14:23:52 UTC (rev 2202)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-08-10 16:11:08 UTC (rev 2203)
@@ -42,7 +42,10 @@
);
this.options = options;
+ //var d = new Date();
this.getElements();
+ //alert(new Date().getTime() - d.getTime());
+
this.selectionManager = new Tree.SelectionManager(this);
this.selectionManager.restoreSelection();
@@ -109,9 +112,7 @@
},
getElements: function() {
- var contentId = this.id;
-
- this.elements.contentTd = $(contentId +
+ this.elements.contentTd = $(this.id +
Tree.ID_DEVIDER + Tree.ID_CHILDS_ROW/* + Tree.ID_DEVIDER + Tree.ID_CHILDS_TD*/);
if (this.elements.contentTd) {
18 years, 9 months
JBoss Rich Faces SVN: r2202 - trunk/samples/richfaces-demo.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-10 10:23:52 -0400 (Fri, 10 Aug 2007)
New Revision: 2202
Modified:
trunk/samples/richfaces-demo/pom.xml
Log:
richfaces-demo switched to 1.5 Java
Modified: trunk/samples/richfaces-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-demo/pom.xml 2007-08-10 14:19:48 UTC (rev 2201)
+++ trunk/samples/richfaces-demo/pom.xml 2007-08-10 14:23:52 UTC (rev 2202)
@@ -30,5 +30,17 @@
</dependencies>
<build>
<finalName>richfaces-demo</finalName>
- </build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file
18 years, 9 months
JBoss Rich Faces SVN: r2201 - trunk/test-applications/facelets/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-08-10 10:19:48 -0400 (Fri, 10 Aug 2007)
New Revision: 2201
Removed:
trunk/test-applications/facelets/src/main/webapp/WEB-INF/.cvsignore
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml.l4t
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataScroller.xml.l4t
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DradAbdDrop.xml.l4t
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Gmap.xml.l4t
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Separator.xml.l4t
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Spacer.xml.l4t
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-SuggestionBox.xml.l4t
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ToolBar.xml.l4t
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml.l4t
Log:
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/.cvsignore
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/.cvsignore 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/.cvsignore 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1 +0,0 @@
-lib
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml.l4t
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml.l4t 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml.l4t 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataScroller.xml.l4t
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataScroller.xml.l4t 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DataScroller.xml.l4t 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DradAbdDrop.xml.l4t
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DradAbdDrop.xml.l4t 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DradAbdDrop.xml.l4t 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Gmap.xml.l4t
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Gmap.xml.l4t 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Gmap.xml.l4t 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Separator.xml.l4t
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Separator.xml.l4t 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Separator.xml.l4t 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Spacer.xml.l4t
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Spacer.xml.l4t 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Spacer.xml.l4t 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-SuggestionBox.xml.l4t
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-SuggestionBox.xml.l4t 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-SuggestionBox.xml.l4t 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ToolBar.xml.l4t
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ToolBar.xml.l4t 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ToolBar.xml.l4t 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml.l4t
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml.l4t 2007-08-10 14:14:59 UTC (rev 2200)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml.l4t 2007-08-10 14:19:48 UTC (rev 2201)
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess">
- <PROCESS-ITEM ENTITY="JSFProcessGroup" NAME="rules:#pages#main.xhtml"
- PATH="/pages/main.xhtml" SHAPE="32,129,0,0">
- <PROCESS-ITEM ENTITY="JSFProcessItem" ID="rules:#pages#main.xhtml:0"
- NAME="item" PATH="/pages/main.xhtml">
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Spinner::#inputNumberSpinner#inputNumberSpinner.xhtml"
- NAME="output" PATH="/inputNumberSpinner/inputNumberSpinner.xhtml"
- TARGET="rules:#inputNumberSpinner#inputNumberSpinner.xhtml" TITLE="Spinner"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Panel::#Panel#Panel.xhtml" NAME="output1"
- PATH="/Panel/Panel.xhtml" TARGET="rules:#Panel#Panel.xhtml" TITLE="Panel"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Separ::#Separator#Separator.xhtml" NAME="output2"
- PATH="/Separator/Separator.xhtml"
- TARGET="rules:#Separator#Separator.xhtml" TITLE="Separ"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Spacer::#Spacer#Spacer.xhtml" NAME="output3"
- PATH="/Spacer/Spacer.xhtml" TARGET="rules:#Spacer#Spacer.xhtml" TITLE="Spacer"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="sTP::#SimpleTogglePanel#SimpleTogglePanel.xhtml" NAME="output4"
- PATH="/SimpleTogglePanel/SimpleTogglePanel.xhtml"
- TARGET="rules:#SimpleTogglePanel#SimpleTogglePanel.xhtml" TITLE="sTP"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="TabPanel::#TabPanel#TabPanel.xhtml" NAME="output5"
- PATH="/TabPanel/TabPanel.xhtml"
- TARGET="rules:#TabPanel#TabPanel.xhtml" TITLE="TabPanel"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Suggest::#SuggestionBox#SuggestionBox.xhtml" NAME="output6"
- PATH="/SuggestionBox/SuggestionBox.xhtml"
- TARGET="rules:#SuggestionBox#SuggestionBox.xhtml" TITLE="Suggest"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Paint::#Paint2D#Paint2D.xhtml" NAME="output7"
- PATH="/Paint2D/Paint2D.xhtml" TARGET="rules:#Paint2D#Paint2D.xhtml" TITLE="Paint"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Tree::#Tree#Tree.xhtml" NAME="output8" PATH="/Tree/Tree.xhtml"
- TARGET="rules:#Tree#Tree.xhtml" TITLE="Tree"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Slide::#inputNumberSlider#inputNumberSlider.xhtml"
- NAME="output9" PATH="/inputNumberSlider/inputNumberSlider.xhtml"
- TARGET="rules:#inputNumberSlider#inputNumberSlider.xhtml" TITLE="Slide"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="PanelBar::#PanelBar#PanelBar.xhtml" NAME="output10"
- PATH="/PanelBar/PanelBar.xhtml"
- TARGET="rules:#PanelBar#PanelBar.xhtml" TITLE="PanelBar"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="TogglePanel::#TogglePanel#TogglePanel.xhtml" NAME="output11"
- PATH="/TogglePanel/TogglePanel.xhtml"
- TARGET="rules:#TogglePanel#TogglePanel.xhtml" TITLE="TogglePanel"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Gmap::#Gmap#Gmap.xhtml" NAME="output12" PATH="/Gmap/Gmap.xhtml"
- TARGET="rules:#Gmap#Gmap.xhtml" TITLE="Gmap"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="ToolBar::#ToolBar#ToolBar.xhtml" NAME="output13"
- PATH="/ToolBar/ToolBar.xhtml" TARGET="rules:#ToolBar#ToolBar.xhtml" TITLE="ToolBar"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="dnd::#DradAndDrop#DragAndDrop.xhtml" NAME="output14"
- PATH="/DradAndDrop/DragAndDrop.xhtml"
- TARGET="rules:#DradAndDrop#DragAndDrop.xhtml" TITLE="dnd"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="DS::#DataScroller#DS.xhtml" NAME="output15"
- PATH="/DataScroller/DS.xhtml" TARGET="rules:#DataScroller#DS.xhtml" TITLE="DS"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="DDMenu::#DropDownMenu#DDMenu.xhtml" NAME="output16"
- PATH="/DropDownMenu/DDMenu.xhtml"
- TARGET="rules:#DropDownMenu#DDMenu.xhtml" TITLE="DDMenu"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="DFS::#DataFilterSlider#DataFilterSlider.xhtml" NAME="output17"
- PATH="/DataFilterSlider/DataFilterSlider.xhtml"
- TARGET="rules:#DataFilterSlider#DataFilterSlider.xhtml" TITLE="DFS"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="PanelMenu::#PanelMenu#PanelMenu.xhtml" NAME="output18"
- PATH="/PanelMenu/PanelMenu.xhtml"
- TARGET="rules:#PanelMenu#PanelMenu.xhtml" TITLE="PanelMenu"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="ModalPanel::#ModalPanel#ModalPanel.xhtml" NAME="output19"
- PATH="/ModalPanel/ModalPanel.xhtml"
- TARGET="rules:#ModalPanel#ModalPanel.xhtml" TITLE="ModalPanel"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Tooltip::#Tooltip#Tooltip.xhtml" NAME="output20"
- PATH="/Tooltip/Tooltip.xhtml" TARGET="rules:#Tooltip#Tooltip.xhtml" TITLE="Tooltip"/>
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Calendar::#Calendar#Calendar.xhtml" NAME="output21"
- PATH="/Calendar/Calendar.xhtml"
- TARGET="rules:#Calendar#Calendar.xhtml" TITLE="Calendar"/>
- </PROCESS-ITEM>
- </PROCESS-ITEM>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#inputNumberSpinner#inputNumberSpinner.xhtml"
- PATH="/inputNumberSpinner/inputNumberSpinner.xhtml" SHAPE="240,128,50,25"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup" NAME="rules:#Panel#Panel.xhtml"
- PATH="/Panel/Panel.xhtml" SHAPE="240,176,50,41">
- <PROCESS-ITEM ENTITY="JSFProcessItem" ID="rules:#Panel#Panel.xhtml:0"
- NAME="item" PATH="/Panel/Panel.xhtml">
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="Sample2::#Panel#panel2.xhtml" NAME="output"
- PATH="/Panel/panel2.xhtml" TARGET="rules:#Panel#panel2.xhtml" TITLE="Sample2"/>
- </PROCESS-ITEM>
- </PROCESS-ITEM>
- <PROCESS-ITEM ENTITY="JSFProcessGroup" NAME="rules:#Panel#panel2.xhtml"
- PATH="/Panel/panel2.xhtml" SHAPE="336,176,50,41">
- <PROCESS-ITEM ENTITY="JSFProcessItem" ID="rules:#Panel#panel2.xhtml:0"
- NAME="item" PATH="/Panel/panel2.xhtml">
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="BackP::#Panel#Panel.xhtml" NAME="output"
- PATH="/Panel/Panel.xhtml" TARGET="rules:#Panel#Panel.xhtml" TITLE="BackP"/>
- </PROCESS-ITEM>
- </PROCESS-ITEM>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#Separator#Separator.xhtml"
- PATH="/Separator/Separator.xhtml" SHAPE="240,248,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#Spacer#Spacer.xhtml" PATH="/Spacer/Spacer.xhtml"
- SHAPE="240,296,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#SimpleTogglePanel#SimpleTogglePanel.xhtml"
- PATH="/SimpleTogglePanel/SimpleTogglePanel.xhtml"
- SHAPE="240,344,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#TabPanel#TabPanel.xhtml" PATH="/TabPanel/TabPanel.xhtml"
- SHAPE="240,392,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#SuggestionBox#SuggestionBox.xhtml"
- PATH="/SuggestionBox/SuggestionBox.xhtml" SHAPE="240,440,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#Paint2D#Paint2D.xhtml" PATH="/Paint2D/Paint2D.xhtml"
- SHAPE="240,488,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#Tree#Tree_old.xhtml" PATH="/Tree/Tree_old.xhtml"
- SHAPE="248,536,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#inputNumberSlider#inputNumberSlider.xhtml"
- PATH="/inputNumberSlider/inputNumberSlider.xhtml"
- SHAPE="248,584,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#PanelBar#PanelBar.xhtml" PATH="/PanelBar/PanelBar.xhtml"
- SHAPE="248,632,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#TogglePanel#TogglePanel.xhtml"
- PATH="/TogglePanel/TogglePanel.xhtml" SHAPE="248,680,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup" NAME="rules:*" PATH="*" SHAPE="40,672,53,42">
- <PROCESS-ITEM ENTITY="JSFProcessItem" ID="rules:*:0" NAME="item" PATH="*">
- <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
- ID="main::#pages#main.xhtml" NAME="output" PATH="/pages/main.xhtml"
- TARGET="rules:#pages#main.xhtml" TITLE="main"/>
- </PROCESS-ITEM>
- </PROCESS-ITEM>
- <PROCESS-ITEM ENTITY="JSFProcessGroup" NAME="rules:#Gmap#Gmap.xhtml"
- PATH="/Gmap/Gmap.xhtml" SHAPE="248,728,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#ToolBar#ToolBar.xhtml" PATH="/ToolBar/ToolBar.xhtml"
- SHAPE="278,80,0,0" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#DradAndDrop#DragAndDrop.xhtml"
- PATH="/DradAndDrop/DragAndDrop.xhtml" SHAPE="240,32,50,25" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#DataScroller#DS.xhtml" PATH="/DataScroller/DS.xhtml"
- SHAPE="554,300,0,0" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#DropDownMenu#DDMenu.xhtml"
- PATH="/DropDownMenu/DDMenu.xhtml" SHAPE="573,177,0,0" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#DataFilterSlider#DataFilterSlider.xhtml"
- PATH="/DataFilterSlider/DataFilterSlider.xhtml" SHAPE="598,433,0,0" persistent="true"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup" NAME="rules:#Tree#Tree.xhtml"
- PATH="/Tree/Tree.xhtml" SHAPE="32,1313,0,0"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#PanelMenu#PanelMenu.xhtml"
- PATH="/PanelMenu/PanelMenu.xhtml" SHAPE="304,1393,0,0"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#ModalPanel#ModalPanel.xhtml"
- PATH="/ModalPanel/ModalPanel.xhtml" SHAPE="304,1425,0,0"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#Tooltip#Tooltip.xhtml" PATH="/Tooltip/Tooltip.xhtml" SHAPE="304,1457,0,0"/>
- <PROCESS-ITEM ENTITY="JSFProcessGroup"
- NAME="rules:#Calendar#Calendar.xhtml" PATH="/Calendar/Calendar.xhtml" SHAPE="304,1489,0,0"/>
-</PROCESS>
18 years, 9 months
JBoss Rich Faces SVN: r2200 - trunk/test-applications/facelets/src/main/java/gmap.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-08-10 10:14:59 -0400 (Fri, 10 Aug 2007)
New Revision: 2200
Added:
trunk/test-applications/facelets/src/main/java/gmap/Gmap.java
Log:
Added: trunk/test-applications/facelets/src/main/java/gmap/Gmap.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/gmap/Gmap.java (rev 0)
+++ trunk/test-applications/facelets/src/main/java/gmap/Gmap.java 2007-08-10 14:14:59 UTC (rev 2200)
@@ -0,0 +1,53 @@
+package gmap;
+
+public class Gmap {
+
+ private String zoom;
+ private String continuousZoom;
+ private String doubleClickZoom;
+ private String dragging;
+
+ public Gmap() {
+ continuousZoom = "false";
+ doubleClickZoom = "false";
+ dragging = "false";
+ }
+
+ public String getZoom() {
+ return zoom;
+ }
+
+ public void setZoom(String zoom) {
+ this.zoom = zoom;
+ }
+
+ public String act() {
+ zoom = "17";
+ System.out.println("zoom=" + zoom);
+ return null;
+ }
+
+ public String getContinuousZoom() {
+ return continuousZoom;
+ }
+
+ public void setContinuousZoom(String continuousZoom) {
+ this.continuousZoom = continuousZoom;
+ }
+
+ public String getDoubleClickZoom() {
+ return doubleClickZoom;
+ }
+
+ public void setDoubleClickZoom(String doubleClickZoom) {
+ this.doubleClickZoom = doubleClickZoom;
+ }
+
+ public String getDragging() {
+ return dragging;
+ }
+
+ public void setDragging(String dragging) {
+ this.dragging = dragging;
+ }
+}
18 years, 9 months
JBoss Rich Faces SVN: r2199 - in trunk/test-applications/facelets/src/main: webapp/Gmap and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-08-10 10:10:38 -0400 (Fri, 10 Aug 2007)
New Revision: 2199
Removed:
trunk/test-applications/facelets/src/main/java/gmap/Gmap.java
Modified:
trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml
Log:
added new attribute
Deleted: trunk/test-applications/facelets/src/main/java/gmap/Gmap.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/gmap/Gmap.java 2007-08-10 13:53:41 UTC (rev 2198)
+++ trunk/test-applications/facelets/src/main/java/gmap/Gmap.java 2007-08-10 14:10:38 UTC (rev 2199)
@@ -1,20 +0,0 @@
-package gmap;
-
-public class Gmap {
-
- String zoom;
-
- public String getZoom() {
- return zoom;
- }
-
- public void setZoom(String zoom) {
- this.zoom = zoom;
- }
-
- public String act() {
- zoom = "17";
- System.out.println("zoom="+zoom);
- return null;
- }
-}
Modified: trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-08-10 13:53:41 UTC (rev 2198)
+++ trunk/test-applications/facelets/src/main/webapp/Gmap/Gmap.xhtml 2007-08-10 14:10:38 UTC (rev 2199)
@@ -1,60 +1,80 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:rich="http://richfaces.ajax4jsf.org/rich"
- xmlns:a4j="http://richfaces.org/a4j">
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j">
- <f:view contentType="text/html" >
+<f:view contentType="text/html">
- <body>
-
-
- <h:panelGrid columns="2">
- <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map"
- gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA"
- style="width:500px;height:400px" />
-
-
- <!-- client side solution -->
- <h:panelGroup>
+ <body>
+ <h:form>
+ <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map"
+ gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA"
+ style="width:500px;height:400px"
+ enableContinuousZoom="#{gmap.continuousZoom}"
+ enableDoubleClickZoom="#{gmap.doubleClickZoom}"
+ enableDragging="#{gmap.dragging}" />
+
+ <h:panelGroup>
+ <f:verbatim>
Controls:<br />
- <a href="javascript:void(0);" onclick="map.hideControls();return false;">Remove</a>
- <a href="javascript:void(0);" onclick="map.showControls();return false;">Show</a>
- <br /><br />
- Type:<br/>
- <a href="javascript:void(0);" onclick="map.setMapType(G_NORMAL_MAP);return false;">Normal</a>
- <a href="javascript:void(0);" onclick="map.setMapType(G_SATELLITE_MAP);return false;">Satellite</a>
- <a href="javascript:void(0);" onclick="map.setMapType(G_HYBRID_MAP);return false;">Hybrid</a>
- <br /><br />
- Zoom:<br/>
- <a href="javascript:void(0);" onclick="map.zoomIn();return false;">In</a>
- <a href="javascript:void(0);" onclick="map.zoomOut();return false;">Out</a>
- <br /><br />
- <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a>
-
- </h:panelGroup>
+ <a href="javascript:void(0);"
+ onclick="map.hideControls();return false;">Remove</a>
+ <a href="javascript:void(0);"
+ onclick="map.showControls();return false;">Show</a>
+ <br />
+ <br />
+ Type:<br />
+ <a href="javascript:void(0);"
+ onclick="map.setMapType(G_NORMAL_MAP);return false;">Normal</a>
+ <a href="javascript:void(0);"
+ onclick="map.setMapType(G_SATELLITE_MAP);return false;">Satellite</a>
+ <a href="javascript:void(0);"
+ onclick="map.setMapType(G_HYBRID_MAP);return false;">Hybrid</a>
+ <br />
+ <br />
+ Zoom:<br />
+ <a href="javascript:void(0);" onclick="map.zoomIn();return false;">In</a>
+ <a href="javascript:void(0);" onclick="map.zoomOut();return false;">Out</a>
+ <br />
+ <br />
+ <a href="javascript:void(0);" onclick="showExadel();return false;">Show
+ Exadel Office</a>
+ <br />
+ <a href="javascript:void(0);"
+ onclick="showExadelInMinsk();return false;">Show Exadel in
+ Belarus</a>
+ </f:verbatim>
+ </h:panelGroup>
+ <rich:panel>
+ <h:panelGrid columns="2">
+ <h:outputText value="Dragging:" />
+ <h:selectBooleanCheckbox value="#{gmap.dragging}" />
- <!-- client side solution -->
- <h:form>
-
- </h:form>
-
-</h:panelGrid>
+ <h:outputText value="Continuous Zoom:" />
+ <h:selectBooleanCheckbox value="#{gmap.continuousZoom}" />
- <a4j:outputPanel id="zoomer">
- <script>
+ <h:outputText value="Double Click Zoom:" />
+ <h:selectBooleanCheckbox value="#{gmap.doubleClickZoom}" />
+
+ <h:commandLink value="submit" action="submit();"></h:commandLink>
+ </h:panelGrid>
+ </rich:panel>
+
+ <a4j:outputPanel id="zoomer">
+ <script>
function zoomIt() {
map.setZoom(#{gmap.zoom});
}
</script>
- </a4j:outputPanel>
+ </a4j:outputPanel>
- <a4j:outputPanel>
- <script>
+ <a4j:outputPanel>
+ <script>
function createMarker(point,html) {
var marker = new GMarker(point);
@@ -64,28 +84,32 @@
return marker;
}
+ function showExadelInMinsk() {
+ var point = new GLatLng(53.92316,27.510737, 53.92316,27.510737);
+ map.setCenter(point);
+ var marker = createMarker(point,'Go to the <a target="_blank" href="http://www.exadel.com">Exadle Web Site</a>');
+ map.setZoom(16);
+ map.addOverlay(marker);
+ }
-
function showExadel() {
-
var point = new GLatLng(37.9721046, -122.0424842834);
map.setCenter(point);
var marker = createMarker(point,'Go to the <a target="_blank" href="http://www.exadel.com">Exadle Web Site</a>');
map.setZoom(16);
map.addOverlay(marker);
-
}
function setCenter(lag, lat, zoom) {
-
- map.setCenter(new GLatLng(lag, lat), zoom);
- var ulp = new GPoint(lag,lat);
- var ul = G_NORMAL_MAP.getProjection().fromPixelToLatLng(ulp,zoom);
-
+ map.setCenter(new GLatLng(lag, lat), zoom);
+ var ulp = new GPoint(lag,lat);
+ var ul = G_NORMAL_MAP.getProjection().fromPixelToLatLng(ulp,zoom);
}
</script>
- </a4j:outputPanel>
+ </a4j:outputPanel>
+ <h:commandLink value="Back" action="main"></h:commandLink>
+ </h:form>
</body>
</f:view>
</html>
\ No newline at end of file
18 years, 9 months
JBoss Rich Faces SVN: r2198 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip.
by richfaces-svn-commits＠lists.jboss.org
Author: dbiatenia
Date: 2007-08-10 09:53:41 -0400 (Fri, 10 Aug 2007)
New Revision: 2198
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml
Log:
append block layout to the tooltip
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml 2007-08-10 13:52:58 UTC (rev 2197)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/use-with-data-table.xhtml 2007-08-10 13:53:41 UTC (rev 2198)
@@ -23,7 +23,7 @@
<div class="sample-container">
<h:form>
<h:outputText value="This tooltip rendered on server in separate request" id="tt3">
- <rich:toolTip direction="top-right" mode="ajax" verticalOffset="5" zorder="200" styleClass="tooltip">
+ <rich:toolTip direction="top-right" mode="ajax" verticalOffset="5" zorder="200" styleClass="tooltip" layout="block">
<f:facet name="defaultContent">
<strong>Wait...</strong>
</f:facet>
@@ -50,10 +50,10 @@
<h:outputText value="Make"/>
</f:facet>
<h:outputText id="make" value="#{vehicle.make}" >
- <rich:toolTip direction="top-right" mode="ajax" delay="1000" styleClass="tooltip" immediate="true">
+ <rich:toolTip direction="top-right" mode="ajax" delay="50000" styleClass="tooltip" immediate="true" layout="block">
<a4j:actionparam name="key" value="#{row}" assignTo="#{toolTipData.currentVehicleIndex}" />
<f:facet name="defaultContent">
- <strong>Wait...</strong>
+ <strong>Wait please, content is loading...</strong>
</f:facet>
<span>Vehicle details:</span>
<h:panelGrid columns="2">
18 years, 9 months