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

fix a bug where pressing delete would not remove an annotation if the video editor had focus (fixes #477)

Browse source
This commit is contained in:
rlx 2012-02-19 14:37:55 +00:00
commit 6a9707ed0b
3 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -486,11 +486,17 @@ Ox.AnnotationPanel = function(options, self) {
renderEditMenu();
};
that.removeItem = function() {
self.options.selected = '';
self.users = getUsers();
renderOptionsMenu();
renderEditMenu();
that.removeItem = function(remove) {
if (remove) {
// remove initiated by video editor
getFolder(self.options.selected).removeItem();
} else {
// called from removeannotation callback
self.options.selected = '';
self.users = getUsers();
renderOptionsMenu();
renderEditMenu();
}
};
that.updateItem = function(id, item) {