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

use Ox.Editable in Ox.AnnotationPanel

Browse source
This commit is contained in:
rlx 2011-10-27 13:13:28 +00:00
commit a949ad2cf4
5 changed files with 53 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,8 @@ Ox.VideoEditor <f:Ox.Element> VideoEditor Object
self <o> shared private variable
@*/
// fixme: should be VideoAnnotationEditor
Ox.VideoEditor = function(options, self) {
self = self || {};
@ -267,7 +269,7 @@ Ox.VideoEditor = function(options, self) {
self.options.layers.forEach(function(layer, i) {
self.$annotationPanel[i] = Ox.AnnotationPanel(
Ox.extend({
width: self.options.annotationSize
width: self.options.annotationsSize - Ox.UI.SCROLLBAR_SIZE
}, layer)
)
.bindEvent({
@ -309,7 +311,6 @@ Ox.VideoEditor = function(options, self) {
{id: resolution + '', title: resolution + 'p'}
);
});
Ox.print('::::::',self.resolutions)
self.$keyboardShortcuts = $('<div>');
[
@ -612,7 +613,6 @@ Ox.VideoEditor = function(options, self) {
src: Ox.UI.getImageURL('symbolSet')
});
that.$element = Ox.SplitPanel({
elements: [
{