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

annotations size

Browse source
This commit is contained in:
j 2014-01-22 18:42:28 +00:00
parent d5eaed5a63
commit 3f4e8764f6
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,6 @@ Ox.ClipPanel = function(options, self) {
annotationsFont: 'small', annotationsFont: 'small',
annotationsMapSize: 256, annotationsMapSize: 256,
annotationsRange: 'all', annotationsRange: 'all',
annotationsSize: 256,
annotationsSort: 'position', annotationsSort: 'position',
clips: [], clips: [],
clickLink: null, clickLink: null,
@ -239,9 +238,14 @@ Ox.ClipPanel = function(options, self) {
showMap: self.options.showAnnotationsMap, showMap: self.options.showAnnotationsMap,
showUsers: self.options.showUsers, showUsers: self.options.showUsers,
sort: self.options.annotationsSort, sort: self.options.annotationsSort,
width: self.options.annotationsSize width: self.options.width
}); });
$list.size = function() {
$list.options({
width: self.options.width
});
};
return $list; return $list;
} else if (self.options.view == 'list') { } else if (self.options.view == 'list') {
$list = Ox.TableList({ $list = Ox.TableList({

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

@ -9,7 +9,6 @@ Ox.VideoEditPanel = function(options, self) {
annotationsFont: 'small', annotationsFont: 'small',
annotationsMapSize: 256, annotationsMapSize: 256,
annotationsRange: 'all', annotationsRange: 'all',
annotationsSize: 256,
annotationsSort: 'position', annotationsSort: 'position',
clips: [], clips: [],
clipSize: 256, clipSize: 256,
@ -298,7 +297,6 @@ Ox.VideoEditPanel = function(options, self) {
annotationsFont: self.options.annotationsFont, annotationsFont: self.options.annotationsFont,
annotationsMapSize: self.options.annotationsMapSize, annotationsMapSize: self.options.annotationsMapSize,
annotationsRange: self.options.annotationsRange, annotationsRange: self.options.annotationsRange,
annotationsSize: self.options.annotationsSize,
annotationsSort: self.options.annotationsSort, annotationsSort: self.options.annotationsSort,
clips: Ox.clone(self.options.clips), clips: Ox.clone(self.options.clips),
clickLink: self.options.clickLink, clickLink: self.options.clickLink,