0x2620/oxjs
2
0
Fork 2
Code Issues 172 Pull requests Releases Wiki Activity

fix event handlers and split panel resize event

Browse source
This commit is contained in:
rolux 2011-09-17 19:39:38 +02:00
commit da9e5dbb29
27 changed files with 722 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/Ox.UI/js/Form/Ox.ColorInput.js
View file

@ -41,7 +41,7 @@ Ox.ColorInput = function(options, self) {
self.$inputs[4] = Ox.ColorPicker({
id: 'picker'
})
.bindEvent('change', function(event, data) {
.bindEvent('change', function(data) {
//Ox.print('change function called');
self.options.value = data.value;
self.values = data.value.split(', ');

2
source/Ox.UI/js/Form/Ox.ColorPicker.js
View file

@ -42,7 +42,7 @@ Ox.ColorPicker = function(options, self) {
position: 'absolute',
top: (i * 15) + 'px'
})
.bindEvent('change', function(event, data) {
.bindEvent('change', function(data) {
change(i, data.value);
})
.appendTo(that);

2
source/Ox.UI/js/Form/Ox.DateInput.js
View file

@ -90,7 +90,7 @@ Ox.DateInput = function(options, self) {
})
.bindEvent('autocomplete', changeMonthOrYear),
year: Ox.Input({
autocomplete: $.map($.merge(Ox.range(1900, 3000), Ox.range(1000, 1900)), function(v, i) {
autocomplete: Ox.merge(Ox.range(1900, 3000), Ox.range(1000, 1900)).map(function(v) {
return v.toString();
}),
autocompleteReplace: true,

2
source/Ox.UI/js/Form/Ox.Filter.js
View file

@ -289,7 +289,7 @@ Ox.Filter = function(options, self) {
}
}
function changeOperator(event, data) {
function changeOperator(data) {
self.options.query.operator = data.selected[0].id;
that.$element.find('.OxGroupLabel').html(self.options.query.operator == '&' ? 'and' : 'or');
}

8
source/Ox.UI/js/Form/Ox.Form.js
View file

@ -41,7 +41,7 @@ Ox.Form = function(options, self) {
that.append(self.$items[i] = Ox.FormItem({element: item}));
item.bindEvent({
/*
blur: function(event, data) {
blur: function(data) {
validate(i, data.valid);
if (data.valid) {
self.$messages[i].html('').hide();
@ -50,15 +50,15 @@ Ox.Form = function(options, self) {
}
},
*/
autovalidate: function(event, data) {
autovalidate: function(data) {
data.valid = !!data.value.length;
validate(i, data.valid);
data.valid && self.$items[i].setMessage('');
},
submit: function(event, data) {
submit: function(data) {
self.formIsValid && that.submit();
},
validate: function(event, data) {
validate: function(data) {
validate(i, data.valid);
self.$items[i].setMessage(data.valid ? '' : data.message);
}

2
source/Ox.UI/js/Form/Ox.FormElementGroup.js
View file

@ -36,7 +36,7 @@ Ox.FormElementGroup = function(options, self) {
float: self.options.float // fixme: make this a class
})
.bindEvent({
validate: function(event, data) {
validate: function(data) {
that.triggerEvent({
validate: data
});

8
source/Ox.UI/js/Form/Ox.Input.js
View file

@ -616,7 +616,7 @@ Ox.Input = function(options, self) {
self.$input.val(self.options.value);//.focus();
}
function clickMenu(event, data) {
function clickMenu(data) {
//Ox.print('clickMenu', data);
self.options.value = data.title;
self.$input.val(self.options.value).focus();
@ -724,7 +724,7 @@ Ox.Input = function(options, self) {
data.text && self.$input.val(data.text);
}
function selectMenu(event, data) {
function selectMenu(data) {
var pos = cursor();
//if (self.options.value) {
//Ox.print('selectMenu', pos, data.title)
@ -1242,7 +1242,7 @@ Ox.Input_ = function(options, self) {
//width(self.options.width);
function changeKey(event, data) {
function changeKey(data) {
//Ox.print('changeKey', data);
if (data) { // fixme: necessary?
self.key = {
@ -1591,7 +1591,7 @@ Ox.InputElement_ = function(options, self) {
that.$element.val('').focus();
}
function clickMenu(event, data) {
function clickMenu(data) {
//Ox.print('clickMenu', data);
that.$element.val(data.title);
//self.$autosuggestMenu.hideMenu();

4
source/Ox.UI/js/Form/Ox.InputGroup.js
View file

@ -73,7 +73,7 @@ Ox.InputGroup = function(options, self) {
.appendTo(that);
});
function change(event, data) {
function change(data) {
//Ox.print('InputGroup change')
that.triggerEvent('change', {
value: self.options.inputs.map(function($input) {
@ -110,7 +110,7 @@ Ox.InputGroup = function(options, self) {
});
}
function validate(event, data) {
function validate(data) {
//Ox.print('INPUTGROUP TRIGGER VALIDATE')
that.triggerEvent('validate', data);
}

8
source/Ox.UI/js/Form/Ox.PlacePicker.js
View file

@ -97,7 +97,7 @@ Ox.PlacePicker = function(options, self) {
self.map = false;
function changeZoom(event, data) {
function changeZoom(data) {
//Ox.print('changeZoom')
self.$map.zoom(data.value);
}
@ -114,18 +114,18 @@ Ox.PlacePicker = function(options, self) {
}
}
function findPlace(event, data) {
function findPlace(data) {
//Ox.print('findPlace', data);
self.$map.find(data.value, function(place) {
place && that.$label.html(place.geoname);
});
}
function onSelect(event, data) {
function onSelect(data) {
that.$label.html(data.geoname);
}
function onZoom(event, data) {
function onZoom(data) {
self.$range.options({
value: data.value
});

4
source/Ox.UI/js/Form/Ox.Select.js
View file

@ -135,11 +135,11 @@ Ox.Select = function(options, self) {
self.options.type == 'image' && self.$menu.addClass('OxRight');
function clickMenu(event, data) {
function clickMenu(data) {
that.triggerEvent('click', data);
}
function changeMenu(event, data) {
function changeMenu(data) {
//Ox.print('clickMenu: ', self.options.id, data)
self.checked = self.optionGroup.checked();
self.$title && self.$title.html(