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

changes in video editor and list map

Browse source
This commit is contained in:
rlx 2012-02-05 01:56:23 +00:00
commit 353fce1f14
5 changed files with 41 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -261,8 +261,7 @@ Ox.AnnotationPanel = function(options, self) {
}
function scrollToSelected(type) {
try {
Ox.print('scrollToSelected $item', that.find('.OxEditableElement.OxSelected'))
//try {
var $item = that.find('.OxEditableElement.OxSelected'),
itemHeight = $item.height() + (type == 'text' ? 8 : 0),
itemTop = $item.offset().top,
@ -280,9 +279,9 @@ Ox.AnnotationPanel = function(options, self) {
scrollTop: scrollTop + 'px'
}, 0);
}
} catch(e) {
Ox.print('THIS SHOULD NOT HAPPEN');
}
//} catch(e) {
// Ox.print('THIS SHOULD NOT HAPPEN');
//}
}
function selectAnnotation(data, index) {

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

@ -692,7 +692,8 @@ Ox.VideoEditor = function(options, self) {
// we need a timeout so that a chained bindEvent
// actually catches the event
self.options.find && setTimeout(function() {
submitFindInput(self.options.find, true);
// only submit if no annotation is selected
submitFindInput(self.options.find, !self.options.selected);
}, 0);
function addAnnotation(layer) {