r2321 - Merged r2226 and r2227 to 1.7.1 (fixes #4292 - Slider: ui.value incorrect in slide event ...
Author: rdworth
Date: Wed Mar 18 17:25:28 2009
New Revision: 2321
Modified:
branches/1.7.1/ui/ui.slider.js (contents, props changed)
Log:
Merged r2226 and r2227 to 1.7.1 (fixes #4292 - Slider: ui.value incorrect
in slide event if handle at value 0)
Modified: branches/1.7.1/ui/ui.slider.js
==============================================================================
--- branches/1.7.1/ui/ui.slider.js (original)
+++ branches/1.7.1/ui/ui.slider.js Wed Mar 18 17:25:28 2009
@@ -299,7 +299,15 @@
},
_start: function(event, index) {
- this._trigger("start", event, this._uiHash(index));
+ var uiHash = {
+ handle: this.handles[index],
+ value: this.value()
+ };
+ if (this.options.values && this.options.values.length) {
+ uiHash.value = this.values(index)
+ uiHash.values = this.values()
+ }
+ this._trigger("start", event, uiHash);
},
_slide: function(event, index, newVal) {
@@ -317,7 +325,11 @@
var newValues = this.values();
newValues[index] = newVal;
// A slide can be canceled by returning false from the slide callback
- var allowed = this._trigger("slide", event, this._uiHash(index,
newVal, newValues));
+ var allowed = this._trigger("slide", event, {
+ handle: this.handles[index],
+ value: newVal,
+ values: newValues
+ });
var otherVal = this.values(index ? 0 : 1);
if (allowed !== false) {
this.values(index, newVal, ( event.type == 'mousedown' &&
this.options.animate ), true);
@@ -328,7 +340,10 @@
if (newVal != this.value()) {
// A slide can be canceled by returning false from the slide callback
- var allowed = this._trigger("slide", event, this._uiHash(index,
newVal));
+ var allowed = this._trigger("slide", event, {
+ handle: this.handles[index],
+ value: newVal
+ });
if (allowed !== false) {
this._setData('value', newVal, ( event.type == 'mousedown' &&
this.options.animate ));
}
@@ -340,11 +355,27 @@
},
_stop: function(event, index) {
- this._trigger("stop", event, this._uiHash(index));
+ var uiHash = {
+ handle: this.handles[index],
+ value: this.value()
+ };
+ if (this.options.values && this.options.values.length) {
+ uiHash.value = this.values(index)
+ uiHash.values = this.values()
+ }
+ this._trigger("stop", event, uiHash);
},
_change: function(event, index) {
- this._trigger("change", event, this._uiHash(index));
+ var uiHash = {
+ handle: this.handles[index],
+ value: this.value()
+ };
+ if (this.options.values && this.options.values.length) {
+ uiHash.value = this.values(index)
+ uiHash.values = this.values()
+ }
+ this._trigger("change", event, uiHash);
},
value: function(newValue) {
@@ -475,19 +506,8 @@
(oRange == "max") && (this.orientation == "vertical") &&
this.range[animate ? 'animate' : 'css']({ height: (100 - valPercent) + '%'
}, { queue: false, duration: o.animate });
}
- },
-
- _uiHash: function(index, value, values) {
-
- var multiple = this.options.values && this.options.values.length;
- return {
- handle: this.handles[index],
- value: value || (multiple ? this.values(index) : this.value()),
- values: values || (multiple && this.values())
- };
-
}
-
+
}));
$.extend($.ui.slider, {