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

fix list calendar bugs

Browse source
This commit is contained in:
rlx 2012-01-30 23:27:27 +00:00
parent b19e4c0c79
commit e8b1362309
5 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,6 +344,13 @@ Ox.Calendar = function(options, self) {
posision: 'absolute', posision: 'absolute',
top: (self.options.showToolbar * 24) + 'px' top: (self.options.showToolbar * 24) + 'px'
}) })
.bindEvent({
dragstart: dragstart,
drag: drag,
dragpause: dragpause,
dragend: dragend,
singleclick: singleclick
})
.appendTo(that); .appendTo(that);
self.$container = Ox.Element() self.$container = Ox.Element()

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

@ -502,9 +502,7 @@ Ox.ListCalendar = function(options, self) {
if (result.status.code == 200) { if (result.status.code == 200) {
self.options.events[index][key] = value; self.options.events[index][key] = value;
self.$list.value(id, key, value); self.$list.value(id, key, value);
if (['name', 'type', 'start', 'end'].indexOf(key) > -1) {
self.$calendar.editEvent(id, key, value); self.$calendar.editEvent(id, key, value);
}
if (key == 'name') { if (key == 'name') {
self.$eventName.options({title: value}); self.$eventName.options({title: value});
} else if (['start', 'end'].indexOf(key) > -1) { } else if (['start', 'end'].indexOf(key) > -1) {
@ -518,7 +516,7 @@ Ox.ListCalendar = function(options, self) {
); );
} }
} else { } else {
alert(result.status.text); // ...
} }
}); });
} }
@ -576,6 +574,9 @@ Ox.ListCalendar = function(options, self) {
self.selectedEvent = event.id; self.selectedEvent = event.id;
self.$eventName.options({title: event.name}); self.$eventName.options({title: event.name});
self.$eventTitle.show(); self.$eventTitle.show();
Ox.print('VALUES:', Ox.extend({}, event, {
end: event.current ? '' : event.end
}))
self.$eventForm.values(Ox.extend({}, event, { self.$eventForm.values(Ox.extend({}, event, {
end: event.current ? '' : event.end end: event.current ? '' : event.end
})).show(); })).show();

3
source/Ox.UI/js/List/Ox.List.js
View file

@ -762,9 +762,8 @@ Ox.List = function(options, self) {
setTimeout(fillFirstPage, 0); setTimeout(fillFirstPage, 0);
self.selected.length && scrollToPosition(self.selected[0]); self.selected.length && scrollToPosition(self.selected[0]);
Ox.Log('List', 'CONSTRUCT:', timeC, 'APPEND:', timeA); Ox.Log('List', 'CONSTRUCT:', timeC, 'APPEND:', timeA);
// that.triggerEvent('init', {items: self.options.items.length}); that.triggerEvent('init', {items: self.options.items.length});
// fixme: do sync lists need to trigger init? // fixme: do sync lists need to trigger init?
// will this only be reached in sync lists?
} }
function loadPage(page, callback) { function loadPage(page, callback) {

5
source/Ox.UI/js/List/Ox.TextList.js
View file

@ -222,11 +222,6 @@ Ox.TextList = function(options, self) {
edit: function(data) { edit: function(data) {
that.editCell(data.id, data.key); that.editCell(data.id, data.key);
}, },
init: function(data) {
// fixme: why does this never reach?
//Ox.Log('List', 'INIT????')
//that.triggerEvent('init', data);
},
select: function() { select: function() {
self.options.selected = that.$body.options('selected'); self.options.selected = that.$body.options('selected');
} }

8
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -28,7 +28,7 @@ Ox.VideoEditor = function(options, self) {
clickLink: null, clickLink: null,
cuts: [], cuts: [],
duration: 0, duration: 0,
download: false, enableDownload: false,
enableSubtitles: false, enableSubtitles: false,
find: '', find: '',
fps: 25, fps: 25,
@ -427,9 +427,9 @@ Ox.VideoEditor = function(options, self) {
{id: 'largeTimeline', title: 'Hide Large Timeline', disabled: true}, {id: 'largeTimeline', title: 'Hide Large Timeline', disabled: true},
{id: 'subtitlesTimeline', title: 'Hide Subtitles on Large Timeline', disabled: true}, {id: 'subtitlesTimeline', title: 'Hide Subtitles on Large Timeline', disabled: true},
{}, {},
{id: 'downloadVideo', title: 'Download Video...', disabled: !self.options.download }, {id: 'downloadVideo', title: 'Download Video...', disabled: !self.options.enableDownload },
{id: 'downloadSelection', title: 'Download Selection...', disabled: !self.options.download}, {id: 'downloadSelection', title: 'Download Selection...', disabled: !self.options.enableDownload},
{id: 'embedSelection', title: 'Embed Selection...', disabled: !self.options.download}, {id: 'embedSelection', title: 'Embed Selection...'},
{}, {},
{id: 'keyboard', title: 'Keyboard Shortcuts...', keyboard: 'h'} {id: 'keyboard', title: 'Keyboard Shortcuts...', keyboard: 'h'}
], ],