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

some work towards making places and events editable from annotations panel (#561)

Browse source
This commit is contained in:
rlx 2012-02-21 10:10:39 +00:00
parent 4008f2e04f
commit 202d11177b
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -269,6 +269,7 @@ Ox.ListCalendar = function(options, self) {
return !!event.type; return !!event.type;
}), }),
height: self.options.height, height: self.options.height,
selected: self.options.selected,
showControls: self.options.showControls, showControls: self.options.showControls,
showToolbar: true, showToolbar: true,
showZoombar: true, showZoombar: true,

2
source/Ox.UI/js/Video/Ox.AnnotationPanel.js
View file

@ -288,7 +288,7 @@ Ox.AnnotationPanel = function(options, self) {
}); });
} else if (data.id == 'manage') { } else if (data.id == 'manage') {
that.triggerEvent('define', { that.triggerEvent('define', {
id: self.options.selected, id: getAnnotation(self.options.selected)[type].id,
type: type type: type
}); });
} else if (data.id == 'save') { } else if (data.id == 'save') {