forked from 0x2620/oxjs
update video editor
This commit is contained in:
parent
b2e8b2ac82
commit
f61e39a788
9 changed files with 141 additions and 80 deletions
|
|
@ -98,6 +98,8 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
});
|
||||
that.triggerEvent('annotations' + data.id, set);
|
||||
}
|
||||
// FIXME: this does not work
|
||||
self.options.selected && getFolder(self.options.selected).gainFocus();
|
||||
}
|
||||
})
|
||||
.appendTo(self.$menubar);
|
||||
|
|
@ -175,7 +177,7 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
that.triggerEvent('submit', data);
|
||||
},
|
||||
toggle: function(data) {
|
||||
that.triggerEvent('toggle', Ox.extend({layer: layer.id}, data));
|
||||
that.triggerEvent('togglelayer', Ox.extend({layer: layer.id}, data));
|
||||
}
|
||||
})
|
||||
.appendTo(self.$folders);
|
||||
|
|
@ -194,11 +196,6 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
],
|
||||
orientation: 'vertical'
|
||||
})
|
||||
.bindEvent({
|
||||
resize: resizeAnnotations,
|
||||
resizeend: resizeendAnnotations,
|
||||
toggle: toggleAnnotations
|
||||
})
|
||||
);
|
||||
|
||||
function getFolder(annotationId) {
|
||||
|
|
@ -242,18 +239,6 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
that.triggerEvent('select', data);
|
||||
}
|
||||
|
||||
function resizeAnnotations() {
|
||||
|
||||
}
|
||||
|
||||
function resizeendAnnotations() {
|
||||
|
||||
}
|
||||
|
||||
function toggleAnnotations() {
|
||||
|
||||
}
|
||||
|
||||
function updateEditMenu() {
|
||||
var action = self.options.selected ? 'enableItem' : 'disableItem';
|
||||
self.$editMenuButton[action]('edit');
|
||||
|
|
@ -274,6 +259,10 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
$folder.options({selected: ''});
|
||||
})
|
||||
}
|
||||
} else if (key == 'width') {
|
||||
self.$folder.forEach(function($folder) {
|
||||
$folder.options({width: self.options.width - Ox.UI.SCROLLBAR_SIZE});
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue