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

fix resize bugs in calendar, list calendar etc

Browse source
This commit is contained in:
rlx 2012-01-30 22:11:05 +00:00
commit 93fe766c7b
6 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -294,6 +294,9 @@ Ox.AnnotationFolder = function(options, self) {
function dragend(e) {
if (self.options.showWidget) {
self.options.type == 'event'
? self.$calendar.resizeCalendar()
: self.$map.resizeMap();
that.triggerEvent('resizewidget', {size: self.options.widgetSize});
}
}
@ -439,6 +442,13 @@ Ox.AnnotationFolder = function(options, self) {
function toggleLayer() {
self.options.collapsed = !self.options.collapsed;
if (
!self.options.collapsed
&& self.options.type == 'place'
&& self.options.showWidget
) {
self.$map.resizeMap();
}
if (self.options.collapsed) {
self.editing && that.blurItem();
self.$annotations.loseFocus();

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

@ -28,6 +28,7 @@ Ox.VideoEditor = function(options, self) {
clickLink: null,
cuts: [],
duration: 0,
download: false,
enableSubtitles: false,
find: '',
fps: 25,
@ -426,9 +427,9 @@ Ox.VideoEditor = function(options, self) {
{id: 'largeTimeline', title: 'Hide Large Timeline', disabled: true},
{id: 'subtitlesTimeline', title: 'Hide Subtitles on Large Timeline', disabled: true},
{},
{id: 'downloadVideo', title: 'Download Video...', disabled: true},
{id: 'downloadSelection', title: 'Download Selection...', disabled: true},
{id: 'embedSelection', title: 'Embed Selection...', disabled: true},
{id: 'downloadVideo', title: 'Download Video...', disabled: !self.options.download },
{id: 'downloadSelection', title: 'Download Selection...', disabled: !self.options.download},
{id: 'embedSelection', title: 'Embed Selection...', disabled: !self.options.download},
{},
{id: 'keyboard', title: 'Keyboard Shortcuts...', keyboard: 'h'}
],
@ -453,6 +454,18 @@ Ox.VideoEditor = function(options, self) {
title: 'Keyboard Shortcuts',
width: 256
}).open();
} else if (id == 'download') {
that.triggerEvent('download');
} else if (id == 'downloadSelection') {
that.triggerEvent('downloadSelection', {
'in': self.options['in'],
out: self.options.out,
});
} else if (id == 'embedSelection') {
that.triggerEvent('embedSelection', {
'in': self.options['in'],
out: self.options.out,
});
}
},
change: function(data) {