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

workaround for select values not getting updated correctly when updating form values

Browse source
This commit is contained in:
rlx 2011-10-11 11:22:16 +00:00
parent e5d0c3fd20
commit f43122f795
4 changed files with 39 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
source/Ox.UI/js/Calendar/Ox.ListCalendar.js
View file

@ -484,7 +484,7 @@ Ox.ListCalendar = function(options, self) {
selectEvent(event); selectEvent(event);
self.$nameInput.focusInput(); self.$nameInput.focusInput();
} else { } else {
alert(result.status.code) alert(result.status.text);
} }
}); });
} }
@ -495,22 +495,26 @@ Ox.ListCalendar = function(options, self) {
data = {id: id}; data = {id: id};
data[key] = value; data[key] = value;
self.options.editEvent(data, function(result) { self.options.editEvent(data, function(result) {
self.options.events[index][key] = value; if (result.status.code == 200) {
self.$list.value(id, key, value); self.options.events[index][key] = value;
if (['name', 'type', 'start', 'end'].indexOf(key) > -1) { self.$list.value(id, key, value);
self.$calendar.editEvent(id, key, value); if (['name', 'type', 'start', 'end'].indexOf(key) > -1) {
} self.$calendar.editEvent(id, key, value);
if (key == 'name') { }
self.$eventName.options({title: value}); if (key == 'name') {
} else if (['start', 'end'].indexOf(key) > -1) { self.$eventName.options({title: value});
self.$durationInput.options({ } else if (['start', 'end'].indexOf(key) > -1) {
value: Ox.formatDateRangeDuration( self.$durationInput.options({
self.$startInput.options('value'), value: Ox.formatDateRangeDuration(
self.$endInput.options('value') self.$startInput.options('value'),
|| Ox.formatDate(new Date(), '%Y-%m-%d %H%:%M:%S'), self.$endInput.options('value')
true || Ox.formatDate(new Date(), '%Y-%m-%d %H%:%M:%S'),
) true
}); )
});
}
} else {
alert(result.status.text);
} }
}); });
} }
@ -546,12 +550,16 @@ Ox.ListCalendar = function(options, self) {
var id = self.selectedEvent, var id = self.selectedEvent,
index = Ox.getPositionById(self.options.events, id); index = Ox.getPositionById(self.options.events, id);
self.options.removeEvent({id: id}, function(result) { self.options.removeEvent({id: id}, function(result) {
self.options.events.splice(index, 1); if (result.status.code == '200') {
var time0 = +new Date(); self.options.events.splice(index, 1);
self.$list.options({items: Ox.clone(self.options.events, true)}); var time0 = +new Date();
Ox.print('TIME TO SET LIST OPTIONS:', +new Date() - time0); self.$list.options({items: Ox.clone(self.options.events, true)});
self.$calendar.removeEvent(); Ox.print('TIME TO SET LIST OPTIONS:', +new Date() - time0);
selectEvent({}); self.$calendar.removeEvent();
selectEvent({});
} else {
alert(result.status.text);
}
}); });
} }

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

@ -138,6 +138,7 @@ Ox.Form = function(options, self) {
//Ox.print('VALUES', values) //Ox.print('VALUES', values)
return values; return values;
} else { } else {
Ox.print('SET FORM VALUES', arguments[0])
Ox.forEach(arguments[0], function(value, key) { Ox.forEach(arguments[0], function(value, key) {
var index = getItemIndexById(key); var index = getItemIndexById(key);
//index > -1 && Ox.print(':::::::', key, value) //index > -1 && Ox.print(':::::::', key, value)

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

@ -43,11 +43,12 @@ Ox.Select = function(options, self) {
size: 'medium', size: 'medium',
title: '', title: '',
type: 'text', // can be 'text' or 'image' type: 'text', // can be 'text' or 'image'
value: [], value: '',
width: 'auto' width: 'auto'
}) })
// fixme: make default selection restorable // fixme: make default selection restorable
// or allow for extra action items below options // or allow for extra action items below options
// fixme: passing value has no effect
.options(options) .options(options)
.addClass( .addClass(
'OxSelect Ox' + Ox.toTitleCase(self.options.size) + ( 'OxSelect Ox' + Ox.toTitleCase(self.options.size) + (
@ -148,6 +149,7 @@ Ox.Select = function(options, self) {
function changeMenu(data) { function changeMenu(data) {
//Ox.print('clickMenu: ', self.options.id, data) //Ox.print('clickMenu: ', self.options.id, data)
self.checked = self.optionGroup.checked(); self.checked = self.optionGroup.checked();
self.options.value = data.checked[0].id;
self.$title && self.$title.html( self.$title && self.$title.html(
self.options.title ? self.options.title : self.options.title ? self.options.title :
data.checked[0].title data.checked[0].title
@ -182,6 +184,8 @@ Ox.Select = function(options, self) {
} }
}; };
// FIXME: selected() _and_ selectItem() _and_ value() ???
/*@ /*@
selected <f> gets selected item selected <f> gets selected item
() -> <o> returns object of selected items with id, title () -> <o> returns object of selected items with id, title

2
source/Ox.UI/js/Window/Ox.Dialog.js
View file

@ -335,10 +335,12 @@ Ox.Dialog = function(options, self) {
left: left, left: left,
top: top top: top
}), animate); }), animate);
/*
that.triggerEvent('resize', { that.triggerEvent('resize', {
width: self.options.width, width: self.options.width,
height: self.options.height height: self.options.height
}); });
*/
} }
function resizestart(event) { function resizestart(event) {