JBoss Rich Faces SVN: r119 - trunk/richfaces/inputnumber-slider/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-03-22 11:31:50 -0400 (Thu, 22 Mar 2007)
New Revision: 119
Modified:
trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
Log:
Fix for bug RFA-321.
Modified: trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
===================================================================
--- trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-03-22 15:08:22 UTC (rev 118)
+++ trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-03-22 15:31:50 UTC (rev 119)
@@ -10,7 +10,7 @@
component="org.richfaces.component.UIInputNumberSlider"
>
<h:styles>css/slider.xcss</h:styles>
- <h:scripts>new org.ajax4jsf.framework.resource.PrototypeScript(),script/SliderScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js</h:scripts>
+ <h:scripts>new org.ajax4jsf.framework.resource.PrototypeScript(),script/SliderScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js,/org/richfaces/renderkit/html/scripts/events.js</h:scripts>
<f:clientid var="clientId"/>
<f:resource name="/org/richfaces/renderkit/html/images/spacer.gif" var="spacer" />
17 years, 2 months
JBoss Rich Faces SVN: r118 - in trunk/richfaces-samples/tabPanelDemo/src/main: webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-22 11:08:22 -0400 (Thu, 22 Mar 2007)
New Revision: 118
Added:
trunk/richfaces-samples/tabPanelDemo/src/main/java/org/richfaces/TabChangeListener.java
Modified:
trunk/richfaces-samples/tabPanelDemo/src/main/java/org/richfaces/Bean.java
trunk/richfaces-samples/tabPanelDemo/src/main/webapp/pages/index.jsp
Log:
Listeners added to demo
Modified: trunk/richfaces-samples/tabPanelDemo/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/richfaces-samples/tabPanelDemo/src/main/java/org/richfaces/Bean.java 2007-03-22 15:08:02 UTC (rev 117)
+++ trunk/richfaces-samples/tabPanelDemo/src/main/java/org/richfaces/Bean.java 2007-03-22 15:08:22 UTC (rev 118)
@@ -25,6 +25,7 @@
import java.util.List;
import javax.faces.component.UIComponent;
+import javax.faces.event.ValueChangeEvent;
import org.richfaces.component.UITabPanel;
@@ -127,4 +128,8 @@
System.out.println("Bean.setValue3()"+value3);
this.value3 = value3;
}
+
+ public void valueChanged(ValueChangeEvent valueChangeEvent) {
+ System.out.println("Bean.valueChanged()");
+ }
}
\ No newline at end of file
Added: trunk/richfaces-samples/tabPanelDemo/src/main/java/org/richfaces/TabChangeListener.java
===================================================================
--- trunk/richfaces-samples/tabPanelDemo/src/main/java/org/richfaces/TabChangeListener.java (rev 0)
+++ trunk/richfaces-samples/tabPanelDemo/src/main/java/org/richfaces/TabChangeListener.java 2007-03-22 15:08:22 UTC (rev 118)
@@ -0,0 +1,26 @@
+/**
+ *
+ */
+package org.richfaces;
+
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.event.ValueChangeListener;
+
+/**
+ * @author Nick Belaevski - nbelaevski(a)exadel.com
+ * created 21.03.2007
+ *
+ */
+public class TabChangeListener implements ValueChangeListener {
+
+ /* (non-Javadoc)
+ * @see javax.faces.event.ValueChangeListener#processValueChange(javax.faces.event.ValueChangeEvent)
+ */
+ public void processValueChange(ValueChangeEvent event)
+ throws AbortProcessingException {
+
+ System.out.println("TabChangeListener.processValueChange()");
+ }
+
+}
Modified: trunk/richfaces-samples/tabPanelDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/richfaces-samples/tabPanelDemo/src/main/webapp/pages/index.jsp 2007-03-22 15:08:02 UTC (rev 117)
+++ trunk/richfaces-samples/tabPanelDemo/src/main/webapp/pages/index.jsp 2007-03-22 15:08:22 UTC (rev 118)
@@ -73,7 +73,9 @@
</h:form>
<h:form>
- <tabs:tabPanel headerSpacing="5px" immediate="false" tabClass="tabClass" activeTabClass="italic" width="100%" switchType="client" binding="#{bean.tabPanel}" value="#{bean.currentTab}" id="tab_panel">
+ <tabs:tabPanel valueChangeListener="#{bean.valueChanged}" headerSpacing="5px" immediate="false" tabClass="tabClass" activeTabClass="italic" width="100%" switchType="client" binding="#{bean.tabPanel}" value="#{bean.currentTab}" id="tab_panel">
+ <f:valueChangeListener type="org.richfaces.TabChangeListener"/>
+
<tabs:tab disabled="#{bean.disabledTabName == 'canon'}" name="canon" label="Canon" switchType="server">
<h:graphicImage value="/pages/Canon_EOS_Digital_Rebel_XT.jpg" alt=""/>
<h:outputText value="Canon EOS Digital Rebel XT" />
17 years, 2 months
JBoss Rich Faces SVN: r117 - in trunk/richfaces/common/src/main/java/org/richfaces: event and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-22 11:08:02 -0400 (Thu, 22 Mar 2007)
New Revision: 117
Modified:
trunk/richfaces/common/src/main/java/org/richfaces/component/UISwitchablePanel.java
trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java
Log:
RF-30 fixed. Changes applied to UISwitchablePanel & SwitchablePanelSwitchEvent
Modified: trunk/richfaces/common/src/main/java/org/richfaces/component/UISwitchablePanel.java
===================================================================
--- trunk/richfaces/common/src/main/java/org/richfaces/component/UISwitchablePanel.java 2007-03-22 14:40:52 UTC (rev 116)
+++ trunk/richfaces/common/src/main/java/org/richfaces/component/UISwitchablePanel.java 2007-03-22 15:08:02 UTC (rev 117)
@@ -98,36 +98,38 @@
}
public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
- if (facesEvent instanceof SwitchablePanelSwitchEvent && isRendered()) {
- FacesContext facesContext = FacesContext.getCurrentInstance();
-
- SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) facesEvent;
- Object newValue = convertSwitchValue((UIComponent) switchEvent.getSource(),
- switchEvent.getValue());
-
- Object oldValue = getValue();
- if (oldValue == null && newValue != null ||
- oldValue != null && !oldValue.equals(newValue)) {
-
- queueEvent(new ValueChangeEvent(this, oldValue, newValue));
+ if (facesEvent instanceof SwitchablePanelSwitchEvent) {
+ if (isRendered()) {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+
+ SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) facesEvent;
+ Object newValue = convertSwitchValue(switchEvent.getEventSource(),
+ switchEvent.getValue());
+
+ Object oldValue = getValue();
+ if (oldValue == null && newValue != null ||
+ oldValue != null && !oldValue.equals(newValue)) {
+
+ queueEvent(new ValueChangeEvent(this, oldValue, newValue));
+ }
+
+ ValueBinding valueBinding = getValueBinding("value");
+ if (valueBinding != null) {
+ valueBinding.setValue(facesContext, newValue);
+ setValue(null);
+ } else {
+ setValue(newValue);
+ }
+
+ if (AjaxRendererUtils.isAjaxRequest(facesContext) && this.getSwitchType().equals(AJAX_METHOD)) {
+ AjaxRendererUtils.addRegionByName(facesContext,
+ this,
+ this.getId());
+ }
}
-
- ValueBinding valueBinding = getValueBinding("value");
- if (valueBinding != null) {
- valueBinding.setValue(facesContext, newValue);
- setValue(null);
- } else {
- setValue(newValue);
- }
-
- if (AjaxRendererUtils.isAjaxRequest(facesContext) && this.getSwitchType().equals(AJAX_METHOD)) {
- AjaxRendererUtils.addRegionByName(facesContext,
- this,
- this.getId());
- }
+ } else /* component should throw IllegalArgumentException for unknown events - RF-30 */ {
+ super.broadcast(facesEvent);
}
-
- super.broadcast(facesEvent);
}
public void updateModel(FacesContext context) {
Modified: trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java
===================================================================
--- trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java 2007-03-22 14:40:52 UTC (rev 116)
+++ trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java 2007-03-22 15:08:02 UTC (rev 117)
@@ -49,23 +49,14 @@
*/
private static final long serialVersionUID = 8579050007143915239L;
- public UIComponent getComponent() {
- return (UIComponent) super.getSource();
- }
-
- public Object getSource() {
- if (eventSource != null) {
- return eventSource;
- }
-
- //fix for MyFaces - they use getSource() in queueEvent()
- return super.getSource();
- }
-
public Object getValue() {
return value;
}
+ public UIComponent getEventSource() {
+ return eventSource;
+ }
+
public boolean isAppropriateListener(FacesListener listener) {
return false;
}
17 years, 2 months
JBoss Rich Faces SVN: r116 - in trunk/richfaces/datascroller/src/main/java/org/richfaces: renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-03-22 10:40:52 -0400 (Thu, 22 Mar 2007)
New Revision: 116
Modified:
trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-28 fixed
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-21 17:59:16 UTC (rev 115)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-22 14:40:52 UTC (rev 116)
@@ -342,7 +342,9 @@
throw new FacesException("Missing 'rows' attribute on component '"
+ uiData.getId() + "'");
}
- uiData.setFirst(page * rows);
+ if (page>0){
+ uiData.setFirst(page * rows);
+ }
}
/**
@@ -354,7 +356,7 @@
int pageCount;
if (rows > 0) {
pageCount = rows <= 0 ? 1 : getRowCount() / rows;
- if (getRowCount() % rows > 0) {
+ if (getRowCount() % rows >= 0) {
pageCount++;
}
}
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-03-21 17:59:16 UTC (rev 115)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-03-22 14:40:52 UTC (rev 116)
@@ -60,6 +60,7 @@
scroller.setHandleValue(Integer.toString(scroller.getPageCount()));
}
else{
+
scroller.setPageIndex(Integer.parseInt(scroller.getHandleValue())-1);
}
@@ -151,7 +152,7 @@
start = 0;
}
- for (int i = start, size = start + pages, j = 1; i < size; i++, j++) {
+ for (int i = start, size = start + pages; i < size; i++) {
//String styleClass;
//String style;
@@ -186,7 +187,7 @@
//out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact "+scroller.getStyleClass(), null);
out.writeAttribute("class", "dr-dscr-inact rich-datascr-inact", null);
//out.writeAttribute("style", ""+scroller.getStyle(), null);
- out.writeAttribute("onclick", getOnClick(context, component,Integer.toString(j)) , null);
+ out.writeAttribute("onclick", getOnClick(context, component,Integer.toString(i+1)) , null);
}
out.writeText(Integer.toString(i + 1), null);
//renderChild(context, link);
17 years, 2 months
JBoss Rich Faces SVN: r115 - trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-21 13:59:16 -0400 (Wed, 21 Mar 2007)
New Revision: 115
Modified:
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java
trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java
Log:
AJAXScript added to required resources
Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java
===================================================================
--- trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-03-21 15:35:53 UTC (rev 114)
+++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-03-21 17:59:16 UTC (rev 115)
@@ -22,11 +22,13 @@
package org.richfaces.renderkit.html;
import java.io.IOException;
+import java.util.LinkedHashSet;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import org.ajax4jsf.framework.ajax.AjaxScript;
import org.ajax4jsf.framework.renderer.RendererUtils.HTML;
import org.ajax4jsf.framework.resource.InternetResource;
import org.ajax4jsf.framework.util.javascript.JSFunction;
@@ -44,6 +46,8 @@
*/
public class DragSupportRenderer extends CompositeRenderer {
+ private InternetResource [] scripts = null;
+
public DragSupportRenderer() {
super();
@@ -58,11 +62,24 @@
}
protected InternetResource[] getScripts() {
- InternetResource[] resources = super.getScripts();
- InternetResource[] result = new InternetResource[resources.length + 1];
- System.arraycopy(resources, 0, result, 0, resources.length);
- result[result.length - 1] = getResource("/org/richfaces/renderkit/html/scripts/simple-draggable.js");
- return result;
+ synchronized (this) {
+ if (scripts == null) {
+ LinkedHashSet set = new LinkedHashSet();
+ InternetResource[] resources = super.getScripts();
+ if (resources != null) {
+ for (int i = 0; i < resources.length; i++) {
+ set.add(resources[i]);
+ }
+ }
+
+ set.add(new AjaxScript());
+ set.add(getResource("/org/richfaces/renderkit/html/scripts/simple-draggable.js"));
+
+ scripts = (InternetResource[]) set.toArray(new InternetResource[set.size()]);
+ }
+ }
+
+ return scripts;
}
public void encodeEnd(FacesContext context, UIComponent component)
Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java
===================================================================
--- trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-03-21 15:35:53 UTC (rev 114)
+++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-03-21 17:59:16 UTC (rev 115)
@@ -22,11 +22,13 @@
package org.richfaces.renderkit.html;
import java.io.IOException;
+import java.util.LinkedHashSet;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import org.ajax4jsf.framework.ajax.AjaxScript;
import org.ajax4jsf.framework.renderer.RendererUtils.HTML;
import org.ajax4jsf.framework.resource.InternetResource;
import org.ajax4jsf.framework.util.javascript.JSFunction;
@@ -44,6 +46,8 @@
*/
public class DropSupportRenderer extends CompositeRenderer {
+ private InternetResource [] scripts = null;
+
public DropSupportRenderer() {
super();
@@ -58,11 +62,24 @@
}
protected InternetResource[] getScripts() {
- InternetResource[] resources = super.getScripts();
- InternetResource[] result = new InternetResource[resources.length + 1];
- System.arraycopy(resources, 0, result, 0, resources.length);
- result[result.length - 1] = getResource("/org/richfaces/renderkit/html/scripts/simple-dropzone.js");
- return result;
+ synchronized (this) {
+ if (scripts == null) {
+ LinkedHashSet set = new LinkedHashSet();
+ InternetResource[] resources = super.getScripts();
+ if (resources != null) {
+ for (int i = 0; i < resources.length; i++) {
+ set.add(resources[i]);
+ }
+ }
+
+ set.add(new AjaxScript());
+ set.add(getResource("/org/richfaces/renderkit/html/scripts/simple-dropzone.js"));
+
+ scripts = (InternetResource[]) set.toArray(new InternetResource[set.size()]);
+ }
+ }
+
+ return scripts;
}
public void encodeEnd(FacesContext context, UIComponent component)
17 years, 2 months
JBoss Rich Faces SVN: r114 - in trunk/richfaces/panelbar/src/main: java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-03-21 11:35:53 -0400 (Wed, 21 Mar 2007)
New Revision: 114
Modified:
trunk/richfaces/panelbar/src/main/config/component/panelbar.xml
trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java
trunk/richfaces/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java
trunk/richfaces/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
Log:
http://jira.jboss.com/jira/browse/RF-20 fixed
Modified: trunk/richfaces/panelbar/src/main/config/component/panelbar.xml
===================================================================
--- trunk/richfaces/panelbar/src/main/config/component/panelbar.xml 2007-03-21 15:33:25 UTC (rev 113)
+++ trunk/richfaces/panelbar/src/main/config/component/panelbar.xml 2007-03-21 15:35:53 UTC (rev 114)
@@ -63,6 +63,11 @@
<classname>java.lang.String</classname>
<description>The component header style class active</description>
</property>
+ <property>
+ <name>value</name>
+ <classname>java.lang.String</classname>
+ <description>Id of expanded panelBarItem</description>
+ </property>
&ui_component_attributes;
Modified: trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java
===================================================================
--- trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-03-21 15:33:25 UTC (rev 113)
+++ trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-03-21 15:35:53 UTC (rev 114)
@@ -28,8 +28,8 @@
*
*/
-public abstract class UIPanelBar
- extends UIComponentBase
+public abstract class UIPanelBar extends UISwitchablePanel
+// extends UIComponentBase
{
public static final String COMPONENT_TYPE = "org.richfaces.PanelBar";
@@ -42,8 +42,12 @@
public abstract void setWidth(String width);
- public boolean getRendersChildren() {
+ public boolean getRendersChildren() {
return true;
}
+ public String getSwitchType() {
+ return CLIENT_METHOD;
+ }
+
}
Modified: trunk/richfaces/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java
===================================================================
--- trunk/richfaces/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-03-21 15:33:25 UTC (rev 113)
+++ trunk/richfaces/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-03-21 15:35:53 UTC (rev 114)
@@ -22,6 +22,9 @@
package org.richfaces.renderkit.html;
import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -34,6 +37,7 @@
import org.ajax4jsf.framework.resource.InternetResource;
import org.ajax4jsf.framework.resource.PrototypeScript;
import org.richfaces.component.UIPanelBar;
+import org.richfaces.event.SwitchablePanelSwitchEvent;
public abstract class PanelBarRendererBase extends HeaderResourcesRendererBase {
@@ -55,13 +59,22 @@
}
public String expanded(FacesContext context, UIComponent component) throws IOException {
-
- Object expanded=component.getAttributes().get(EXPANDED_ATTR);
+ UIPanelBar panelbar = (UIPanelBar) component;
+ String value = (String)panelbar.getValue();
+ if (value != null) {
+ UIComponent item = component.findComponent(value);
+ if (item != null) {
+ panelbar.setValue(item.getClientId(context));
+ return item.getClientId(context);
+ }
+ }
+ return "";
+/* Object expanded=component.getAttributes().get(EXPANDED_ATTR);
String exp=component.getChildCount()==0?"-1":"0";
if (expanded!=null) {
exp=expanded.toString();
}
- return exp;
+ return exp; */
}
public String width(FacesContext context, UIComponent component) throws IOException {
@@ -83,10 +96,17 @@
public void decode(FacesContext context, UIComponent component) {
super.decode(context,component);
- Object property=context.getExternalContext().getRequestParameterMap().get(component.getClientId(context));
+
+ Map requestParameterMap = context.getExternalContext().getRequestParameterMap();
+ String value = (String)requestParameterMap.get(component.getClientId(context));
+ if (value != null) {
+ new SwitchablePanelSwitchEvent(component, value, null).queue();
+ }
+
+/* Object property=context.getExternalContext().getRequestParameterMap().get(component.getClientId(context));
if (property!=null){
component.getAttributes().put(EXPANDED_ATTR,property);
- }
+ }*/
}
}
Modified: trunk/richfaces/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
===================================================================
--- trunk/richfaces/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2007-03-21 15:33:25 UTC (rev 113)
+++ trunk/richfaces/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2007-03-21 15:35:53 UTC (rev 114)
@@ -23,7 +23,7 @@
this.input=$(panelId+"_panelBarInput");
- this.defaultIndex=$F(panelId+"_panelBarInput");
+ this.defaultIndex=this.findPanelById($F(panelId+"_panelBarInput"));
Event.observe(window,'load',this.handleOnLoad.bindAsEventListener(this));
@@ -81,7 +81,8 @@
}
slide.showContent();
this.current=slide;
- this.input.value=this.current.index;
+// this.input.value=this.current.index;
+ this.input.value=this.current.item.id;
},
@@ -106,7 +107,15 @@
}
return kids;
+ },
+
+ findPanelById: function(value) {
+ for(var i = 0; i<this.slides.length; i++) {
+ if (this.slides[i].item.id==value) return i;
+ }
+ return 0;
}
+
}
17 years, 2 months
JBoss Rich Faces SVN: r113 - trunk/richfaces/common/src/main/java/org/richfaces/event.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-03-21 11:33:25 -0400 (Wed, 21 Mar 2007)
New Revision: 113
Modified:
trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java
Log:
duplicate valueChangeEvent fixed
Modified: trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java
===================================================================
--- trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java 2007-03-21 14:59:23 UTC (rev 112)
+++ trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java 2007-03-21 15:33:25 UTC (rev 113)
@@ -22,15 +22,15 @@
package org.richfaces.event;
import javax.faces.component.UIComponent;
+import javax.faces.event.FacesEvent;
import javax.faces.event.FacesListener;
-import javax.faces.event.ValueChangeEvent;
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
* created 23.01.2007
*
*/
-public class SwitchablePanelSwitchEvent extends ValueChangeEvent {
+public class SwitchablePanelSwitchEvent extends FacesEvent {
private Object value;
private UIComponent eventSource;
@@ -38,7 +38,7 @@
public SwitchablePanelSwitchEvent(UIComponent component,
Object value, UIComponent eventSource) {
- super(component,null,value);
+ super(component);
this.value = value;
this.eventSource = eventSource;
17 years, 2 months
JBoss Rich Faces SVN: r112 - trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-03-21 10:59:23 -0400 (Wed, 21 Mar 2007)
New Revision: 112
Modified:
trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
Log:
Fix for bug RFA-321.
Modified: trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
===================================================================
--- trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2007-03-21 14:58:14 UTC (rev 111)
+++ trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2007-03-21 14:59:23 UTC (rev 112)
@@ -270,22 +270,56 @@
this.fireEditEvent("change");
},
- fireClickIfNeeded: function(event){
- if (this.prevMouseDownEvent.target != event.target &&
- //this.prevMouseDownEvent.screenX == event.clientX &&
- //this.prevMouseDownEvent.screenY == event.clientY &&
- RichFaces.navigatorType() != "MSIE") {
+ fireClickIfNeeded: function(event){
+/* alert('navigatorType is ' + navigator.userAgent
+ + "\n" + "prevMouseDownEvent target is " + this.prevMouseDownEvent.target
+ + "\n" + "event target is " + event.target
+ + "\n" + "target.tagName is " + event.target.tagName
+ + "\n" + "appCodeName is " + navigator.appCodeName
+ + "\n" + "appName is " + navigator.appName
+ + "\n" + "appVersion is " + navigator.appVersion
+ + "\n" + "navigatorType is " + RichFaces.navigatorType()
+ + "\n" + "OperaVersion is " + RichFaces.getOperaVersion()
+ + "\n" + "bool operator return " + (RichFaces.getOperaVersion() && RichFaces.getOperaVersion() < 9.0 && event.target.tagName.toLowerCase() == "td"));
+*/
+ if ((this.prevMouseDownEvent.target != event.target &&
+ //this.prevMouseDownEvent.screenX == event.clientX &&
+ //this.prevMouseDownEvent.screenY == event.clientY &&
+ RichFaces.navigatorType() == "FF")
+ || (RichFaces.getOperaVersion() && RichFaces.getOperaVersion() < 9.0 &&
+ //|| ((this.isOpera8() &&
+ //|| ((this.isOpera8algoritm2() &&
+ event.target.tagName.toLowerCase() != "div")) {
if( document.createEvent ) {
var evObj = document.createEvent("MouseEvents");
evObj.initEvent( "click", true, false );
- //evObj.initMouseEvent("click", true, false, window,
- // event.detail, event.screenX, event.screenY, event.clientX, event.clientY,
- // event.ctrlKey, event.altKey, event.shiftKey, event.metaKey, event.button, null);
+ //evObj.initMouseEvent("click", true, false, window,
+ // event.detail, event.screenX, event.screenY, event.clientX, event.clientY,
+ // event.ctrlKey, event.altKey, event.shiftKey, event.metaKey, event.button, null);
this.mainTable.dispatchEvent(evObj);
}
}
},
-
+
+/* isOpera8: function(){
+ var operaPosition = navigator.userAgent.toLowerCase().indexOf("opera");
+ if (operaPosition >= 0 &&
+ navigator.userAgent.charAt(operaPosition + 6) == "8"){
+ return true;
+ }
+ return false;
+ },
+
+ isOpera8algoritm2: function(){
+ if (window.opera) {
+ var index = navigator.userAgent.toLowerCase().indexOf("opera");
+ if (parseInt(navigator.userAgent.toLowerCase().substring(index+6)) == 8) {
+ return true;
+ }
+ }
+ return false;
+ },
+*/
isValueChanged : function(){
var ret =this.prevValue != this.value
this.prevValue = this.value;
17 years, 2 months
JBoss Rich Faces SVN: r111 - trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-03-21 10:58:14 -0400 (Wed, 21 Mar 2007)
New Revision: 111
Modified:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/browser_info.js
Log:
Fix for bug RFA-321.
Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/browser_info.js
===================================================================
--- trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/browser_info.js 2007-03-21 12:45:20 UTC (rev 110)
+++ trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/browser_info.js 2007-03-21 14:58:14 UTC (rev 111)
@@ -14,3 +14,9 @@
return "NETSCAPE";
return "OTHER";
}
+
+RichFaces.getOperaVersion = function () {
+ var index = navigator.userAgent.toLowerCase().indexOf("opera");
+ if (index == -1) return;
+ return parseFloat(navigator.userAgent.toLowerCase().substring(index+6));
+}
17 years, 2 months
JBoss Rich Faces SVN: r110 - trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-21 08:45:20 -0400 (Wed, 21 Mar 2007)
New Revision: 110
Modified:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js
Log:
If params are missing, defaults were not set
Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js
===================================================================
--- trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js 2007-03-21 10:57:43 UTC (rev 109)
+++ trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-common.js 2007-03-21 12:45:20 UTC (rev 110)
@@ -2,10 +2,13 @@
var attr = elt.attributes["rich:defaultdndparams"];
if (attr) {
- return attr.value.parseJSON();
+ var params = attr.value.parseJSON();
+ if (params) {
+ return params;
+ }
}
- return null;
+ return {};
}
DnD.getDnDMergedParams = function(elt, name) {
@@ -38,9 +41,6 @@
DnD.setDefaultDnDParams = function(params) {
if (params) {
if (drag && drag.source && drag.source.getDraggableItems && drag.source.getDraggableItems() > 1) {
- if (!params) {
- params = {};
- }
var itemsCount = drag.source.getDraggableItems();
params["count"] = itemsCount;
17 years, 2 months