sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

some fixes for map, range and videopreview

Browse source
This commit is contained in:
rlx 2011-09-30 10:34:33 +00:00
commit c6d67420a8
6 changed files with 88 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

28
source/Ox.UI/js/Form/Ox.Range.js
View file

@ -45,16 +45,16 @@ Ox.Range = function(options, self) {
value: 0,
valueNames: null,
})
.options(Ox.extend(options, {
arrowStep: options.arrowStep ?
options.arrowStep : options.step,
trackImages: $.makeArray(options.trackImages || [])
}))
.options(options || {})
.addClass('OxRange')
.css({
width: self.options.size + 'px'
});
self.options.arrowStep = options.arrowStep || self.options.step;
self.options.trackImages = Ox.isArray(self.options.trackImages)
? self.options.trackImages : [self.options.trackImages];
Ox.extend(self, {
trackColors: self.options.trackColors.length,
trackImages: self.options.trackImages.length,
@ -145,7 +145,11 @@ Ox.Range = function(options, self) {
function clickArrow(data, i, animate) {
// fixme: shift doesn't work, see menu scrolling
setValue(self.options.value + self.options.arrowStep * (i == 0 ? -1 : 1) * (data.shiftKey ? 2 : 1), animate);
setValue(
self.options.value
+ self.options.arrowStep * (i == 0 ? -1 : 1) * (data.shiftKey ? 2 : 1),
animate
);
}
function clickTrack(data) {
@ -209,12 +213,12 @@ Ox.Range = function(options, self) {
self.$thumb.stop().animate({
marginLeft: (getPx(self.options.value) - 1) + 'px',
//width: self.thumbSize + 'px'
}, animate ? 200 : 0, function() {
}, animate ? 250 : 0, function() {
if (self.options.thumbValue) {
self.$thumb.options({
title: self.options.valueNames ?
self.options.valueNames[self.options.value] :
self.options.value
title: self.options.valueNames
? self.options.valueNames[self.options.value]
: self.options.value
});
}
});
@ -240,9 +244,7 @@ Ox.Range = function(options, self) {
//time = getTime(self.options.value, value);
self.options.value = value;
setThumb(animate);
that.triggerEvent('change', {
value: value
});
that.triggerEvent('change', {value: value});
}
}