[richfaces-svn-commits] JBoss Rich Faces SVN: r5019 - in trunk/ui/dataFilterSlider/src/main: resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src and 1 other directory.
Author: sergeyhalipov
Date: 2007-12-26 12:47:52 -0500 (Wed, 26 Dec 2007)
New Revision: 5019
Modified:
trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java
trunk/ui/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js
Log:
http://jira.jboss.com/jira/browse/RF-1761
Modified:
trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java
===================================================================
---
trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java 2007-12-26
17:30:04 UTC (rev 5018)
+++
trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java 2007-12-26
17:47:52 UTC (rev 5019)
@@ -22,10 +22,8 @@
package org.richfaces.renderkit;
import java.io.IOException;
-import java.nio.Buffer;
import java.util.Map;
-import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
import javax.faces.component.UIInput;
@@ -37,7 +35,6 @@
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSReference;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
-import org.ajax4jsf.renderkit.RendererUtils;
import org.ajax4jsf.util.SelectUtils;
import org.richfaces.component.UIDataFltrSlider;
import org.richfaces.event.DataFilterSliderEvent;
@@ -170,8 +167,12 @@
Integer newSliderVal = dataFilterSlider.getStartRange();
if (requestParams.get(clientId + "slider_val") != null
- && !"".equals(requestParams.get(clientId +
"slider_val"))) {
- newSliderVal = Integer.valueOf(requestParams.get(clientId +
"slider_val").toString());
+ && !"".equals(requestParams.get(clientId +
"slider_val"))) {
+ try {
+ newSliderVal = Integer.valueOf(requestParams.get(clientId +
"slider_val").toString());
+ } catch (NumberFormatException nfe) {
+ newSliderVal = oldSliderVal;
+ }
}
if (newSliderVal.equals(oldSliderVal)) {
Modified:
trunk/ui/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js
===================================================================
---
trunk/ui/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js 2007-12-26
17:30:04 UTC (rev 5018)
+++
trunk/ui/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js 2007-12-26
17:47:52 UTC (rev 5019)
@@ -153,8 +153,10 @@
this.values[handleIdx] = sliderValue;
this.value = this.values[0]; // assure backwards compat
- this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
- this.translateToPx(sliderValue);
+ if (!isNaN(sliderValue)) {
+ this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
+ this.translateToPx(sliderValue);
+ }
this.drawSpans();
if((!this.dragging || !this.event)&&this.flag) this.updateFinished();