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

fix bugs in video editor; begin to implement new list map mode that allows for defining/clearing places

Browse source
This commit is contained in:
rlx 2012-02-04 08:58:46 +00:00
commit 3c94f44a99
15 changed files with 437 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -281,6 +281,7 @@ Ox.AnnotationPanel = function(options, self) {
}
function selectAnnotation(data, index) {
Ox.print('selectAnnotation', index)
self.options.selected = data.id;
if (data.id) {
self.$folder.forEach(function($folder, i) {
@ -288,25 +289,6 @@ Ox.AnnotationPanel = function(options, self) {
});
scrollToSelected(self.options.layers[index].type);
}
/*
if (data.top) {
data.bottom = data.top + data.height;
height = self.$folders.height();
top = self.$folders.offset().top;
scrollTop = self.$folders.scrollTop();
if (data.top < top || data.bottom > height) {
if (data.top < top) {
Ox.print('top scrollTop', data.top, scrollTop)
scrollTop += data.top - top;
} else {
scrollTop += data.bottom - top - height;
}
self.$folders.animate({
scrollTop: scrollTop + 'px'
}, 0);
}
}
*/
that.triggerEvent('select', data);
}