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

edit sort

Browse source
This commit is contained in:
j 2014-02-06 10:27:57 +00:00
commit a85a38d60c
2 changed files with 122 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,10 +10,9 @@ Ox.VideoEditPanel = function(options, self) {
annotationsMapSize: 256,
annotationsRange: 'all',
annotationsSort: 'position',
clipRatio: 16/9,
clips: [],
clipSize: 256,
clipSort: [],
clipSortOptions: [],
clipTooltip: 'clips',
clipView: 'list',
clickLink: null,
@ -43,6 +42,8 @@ Ox.VideoEditPanel = function(options, self) {
showTimeline: false,
showUsers: false,
smallTimelineURL: '',
sort: [],
sortOptions: [],
subtitles: [],
timeline: '',
timelineTooltip: 'timeline',
@ -56,7 +57,7 @@ Ox.VideoEditPanel = function(options, self) {
clips: function() {
self.$clipPanel.options({
clips: Ox.clone(self.options.clips),
sort: self.options.clipSort
sort: self.options.sort
});
},
duration: function() {
@ -299,6 +300,7 @@ Ox.VideoEditPanel = function(options, self) {
annotationsMapSize: self.options.annotationsMapSize,
annotationsRange: self.options.annotationsRange,
annotationsSort: self.options.annotationsSort,
clipRatio: self.options.clipRatio,
clips: Ox.clone(self.options.clips),
clickLink: self.options.clickLink,
duration: self.options.duration,
@ -313,7 +315,7 @@ Ox.VideoEditPanel = function(options, self) {
showAnnotationsMap: self.options.showAnnotationsMap,
showLayers: self.options.showLayers,
showUsers: self.options.showUsers,
sort: self.options.clipSort,
sort: self.options.sort,
sortOptions: self.options.sortOptions,
view: self.options.clipView,
width: self.options.clipSize
@ -356,7 +358,7 @@ Ox.VideoEditPanel = function(options, self) {
that.triggerEvent('select', data);
},
sort: function(data) {
self.options.clipSort = data;
self.options.sort = data;
that.triggerEvent('sort', data);
},
split: function(data) {