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

fix a corner case in Ox.formatDateRangeDuration()

Browse source
This commit is contained in:
rlx 2011-10-10 17:00:01 +00:00
commit ccece375c0
4 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/Ox.UI/js/Calendar/Ox.Calendar.js
View file

@ -46,9 +46,6 @@ Ox.Calendar = function(options, self) {
//height: self.options.height + 'px'
})
.bindEvent({
anyclick: function(e) {
!$(e.target).is('.OxInput') && that.gainFocus();
},
key_0: function() {
panToSelected();
},
@ -81,6 +78,9 @@ Ox.Calendar = function(options, self) {
},
key_up: function() {
scrollBy(-1);
},
mousedown: function(e) {
!$(e.target).is('.OxInput') && that.gainFocus();
}
});

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

@ -490,10 +490,14 @@ Ox.ListCalendar = function(options, self) {
index = Ox.getPositionById(self.options.events, id),
data = {id: id};
self.options.events[index][key] = value;
//Ox.print('EQUAL?', Ox.isEqual(self.$list.options('items'), self.options.events));
//alert(self.options.events[index][key] + '\n' + self.$list.options('items')[index][key]);
data[key] = value;
if (['start', 'end'].indexOf(key) > -1) {
self.$list.options({items: Ox.clone(self.options.events, true)});
if (['name', 'type', 'start', 'end'].indexOf(key) > -1) {
self.$calendar.editEvent(id, key, value);
}
if (key == 'name') {
self.$eventName.options({title: value});
} else if (['start', 'end'].indexOf(key) > -1) {
self.$durationInput.options({
value: Ox.formatDateRangeDuration(
self.$startInput.options('value'),
@ -503,10 +507,7 @@ Ox.ListCalendar = function(options, self) {
)
});
}
self.$list.options({items: Ox.clone(self.options.events, true)});
if (['name', 'type', 'start', 'end'].indexOf(key) > -1) {
self.$calendar.editEvent(id, key, value);
}
self.options.editEvent(data, function(result) {
// ...
});

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

@ -177,6 +177,7 @@ Ox.Select = function(options, self) {
self.setOption = function(key, value) {
if (key == 'value') {
Ox.print('SETTING VALUE OPTION', value)
that.selectItem(value);
}
};
@ -223,6 +224,8 @@ Ox.Select = function(options, self) {
//Ox.print('selected::', that.selected())
return that.selected()[0].id;
} else {
that.selectItem(arguments[0]);
return that;
/*
Ox.print('ELSE');
that.selectItem(arguments[0]);