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

fix a corner case in Ox.formatDateRangeDuration()

Browse source
This commit is contained in:
rlx 2011-10-10 17:00:01 +00:00
parent 46ef208be2
commit ccece375c0
4 changed files with 28 additions and 12 deletions
Show stats 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]);

16
source/Ox/js/Format.js
View file

@ -382,19 +382,31 @@ Ox.formatDateRangeDuration = function(start, end, utc) {
Ox.forEach(keys, function(key, i) {
while (true) {
if (key == 'month') {
// set the day to the same day in the next month,
// or to its last day if the next month is shorter
var day = Ox.getDate(date, utc);
Ox.setDate(date, Math.min(
Ox.getDate(date, utc),
day,
Ox.getDaysInMonth(
Ox.getFullYear(date, utc),
Ox.getMonth(date, utc) + 2
Ox.getMonth(date, utc) + 2,
utc
)
), utc);
}
// advance the date by one unit
Ox['set' + parts[i]](date, Ox['get' + parts[i]](date, utc) + 1, utc);
Ox.print(key, '.....', date)
if (date <= dates[1]) {
// still within the range, add one unit
values[i] = (values[i] || 0) + 1;
} else {
// outside the range, rewind the date by one unit
Ox['set' + parts[i]](date, Ox['get' + parts[i]](date, utc) - 1, utc);
if (key == 'month') {
// and revert to original day
Ox.setDate(date, day, utc);
}
break;
}
}