[richfaces-svn-commits] JBoss Rich Faces SVN: r2107 - in trunk/ui/dataFilterSlider/src/main: resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: sergeyhalipov
Date: 2007-08-07 12:24:30 -0400 (Tue, 07 Aug 2007)
New Revision: 2107

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-554

Modified: trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java
===================================================================
--- trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java	2007-08-07 15:46:38 UTC (rev 2106)
+++ trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java	2007-08-07 16:24:30 UTC (rev 2107)
@@ -63,12 +63,12 @@
 
         if (slider.isOnSlide()) {
             sliderScript = sliderScript +
-                    "onSlide: function(v) { updateSlider1(v);},\n";
+                    "onSlide: function(v) { updateSlider1(v);}";
         }
 
         if (slider.isOnChange()) {
             sliderScript = sliderScript +
-                    "onChange: function(v) { updateSlider1(v);}\n";
+                    ",\nonChange: function(v) { updateSlider1(v);}\n";
         }
 
         sliderScript = sliderScript + "            });\n";

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-08-07 15:46:38 UTC (rev 2106)
+++ trunk/ui/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js	2007-08-07 16:24:30 UTC (rev 2107)
@@ -264,8 +264,13 @@
     pointer[1] -= this.offsetY + offsets[1];
     this.event = event;
     this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
-    if(this.initialized && this.options.onSlide)
-      this.options.onSlide(this.values.length>1 ? this.values : this.values[0], this);
+    if(this.initialized) {
+    	if (this.options.onSlide) {
+      		this.options.onSlide(this.values.length>1 ? this.values : this.values[0], this);
+      	} else if (this.options.onChange) {
+      		this.options.onChange(this.values.length>1 ? this.values : this.values[0], this);
+      	}
+    }
   },
   endDrag: function(event) {
     if(this.active && this.dragging) {
@@ -281,8 +286,13 @@
     this.updateFinished();
   },
   updateFinished: function() {
-    if(this.initialized && this.options.onChange)
-      this.options.onChange(this.values.length>1 ? this.values : this.values[0], this);
+    if(this.initialized) {
+    	if (this.options.onSlide) {
+    		this.options.onSlide(this.values.length>1 ? this.values : this.values[0], this);
+    	} else if (this.options.onChange) {
+			this.options.onChange(this.values.length>1 ? this.values : this.values[0], this);
+		}
+	}
     this.event = null;
   }
 }
\ No newline at end of file