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

various annotation-related bugfixes

Browse source
This commit is contained in:
rlx 2012-01-27 19:59:11 +05:30
commit a7a3f167c9
10 changed files with 135 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

41
source/Ox.UI/js/Video/Ox.AnnotationFolder.js
View file

@ -72,23 +72,34 @@ Ox.AnnotationFolder = function(options, self) {
}
self.$addButton = Ox.Button({
disabled: !self.options.editable,
id: 'add',
style: 'symbol',
title: 'add',
tooltip: 'Add ' + self.options.item,
type: 'image'
}).bindEvent({
click: function() {
that.triggerEvent('add', {value: ''});
}
});
id: 'add',
style: 'symbol',
title: 'add',
tooltip: 'Add ' + self.options.item,
type: 'image'
})
.bindEvent({
click: function() {
that.triggerEvent('add', {value: ''});
}
});
self.$infoButton = Ox.Button({
style: 'symbol',
title: 'info',
type: 'image'
})
.bindEvent({
click: function() {
that.triggerEvent('info');
}
});
self.$panel = Ox.CollapsePanel({
collapsed: self.options.collapsed,
extras: Ox.merge(
self.widget ? [self.$defineButton] : [],
[self.$addButton]
[self.options.editable ? self.$addButton : self.$infoButton]
),
size: 16,
title: self.options.title
@ -120,7 +131,8 @@ Ox.AnnotationFolder = function(options, self) {
events: getEvents(),
height: self.widgetSize,
showZoombar: true,
width: self.options.width
width: self.options.width,
zoomOnlyWhenFocused: true
})
.css({
width: self.options.width + 'px',
@ -146,7 +158,8 @@ Ox.AnnotationFolder = function(options, self) {
places: getPlaces(),
showTypes: true,
// FIXME: should be showZoombar
zoombar: true
zoombar: true,
zoomOnlyWhenFocused: true
// showLabels: true
})
.css({