1
0
Fork 0
forked from 0x2620/oxjs

merging changes

This commit is contained in:
rolux 2011-07-26 16:34:36 +02:00
commit 4b1eadc021
3 changed files with 12 additions and 13 deletions

View file

@ -473,17 +473,17 @@ Ox.Input = function(options, self) {
} else if (value == '.') {
value = '0.' + self.decimals;
cursor = [2, value.length];
} else if (!/\./(value)) {
value += '.' + self.decimals
} else if (!/\./.test(value)) {
value += '.' + self.decimals;
cursor = [value.indexOf('.'), value.length];
} else if (/^\./(value)) {
} else if (/^\./.test(value)) {
value = '0' + value;
cursor = [2, value.length];
} else if (/\.$/(value)) {
} else if (/\.$/.test(value)) {
//Ox.print('$$$$$$$$$$$')
value += self.decimals;
cursor = [value.indexOf('.') + 1, value.length];
} else if (/\./(value) && self.options.decimals) {
} else if (/\./.test(value) && self.options.decimals) {
length = value.split('.')[1].length;
if (length > self.options.decimals) {
value = value.substr(0, value.indexOf('.') + 1 + self.options.decimals);
@ -499,7 +499,7 @@ Ox.Input = function(options, self) {
cursor = [0, 1];
}
}
while (/^0\d/(value)) {
while (/^0\d/.test(value)) {
value = value.substr(1, value.length);
}
if (!regexp.test(value) || value < self.options.min || value > self.options.max) {

View file

@ -1013,7 +1013,6 @@ Ox.Map = function(options, self) {
if (place) {
select();
} else {
Ox.print()
// async && place doesn't exist yet
self.options.places({
keys: self.placeKeys,