0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

video edit panel: fix view event, make icon list draggable, show milliseconds in player

Browse source
This commit is contained in:
rlx 2013-07-18 09:57:51 +00:00
parent 54f665e39f
commit a4ab0c1eb3
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/Ox.UI/js/Video/ClipPanel.js
View file

@ -81,7 +81,7 @@ Ox.ClipPanel = function(options, self) {
if (data.id == 'view') { if (data.id == 'view') {
self.options.view = data.checked[0].id; self.options.view = data.checked[0].id;
self.$panel.replaceElement(1, self.$list = getList()); self.$panel.replaceElement(1, self.$list = getList());
self.$panel.triggerEvent('view', {view: self.options.view}); that.triggerEvent('view', {view: self.options.view});
} }
}, },
click: function(data) { click: function(data) {
@ -264,6 +264,7 @@ Ox.ClipPanel = function(options, self) {
}); });
} else { } else {
$list = Ox.IconList({ $list = Ox.IconList({
draggable: true,
fixedRatio: pandora.site.video.previewRatio, fixedRatio: pandora.site.video.previewRatio,
item: function(data, sort, size) { item: function(data, sort, size) {
size = size || 128; // fixme: is this needed? size = size || 128; // fixme: is this needed?

1
source/Ox.UI/js/Video/VideoEditPanel.js
View file

@ -158,6 +158,7 @@ Ox.VideoEditPanel = function(options, self) {
position: self.options.position, position: self.options.position,
resolution: self.options.resolution, resolution: self.options.resolution,
scaleToFill: self.options.scaleToFill, scaleToFill: self.options.scaleToFill,
showMilliseconds: 3,
subtitles: self.options.subtitles, subtitles: self.options.subtitles,
timeline: self.options.smallTimelineURL, timeline: self.options.smallTimelineURL,
video: self.options.video, video: self.options.video,