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

fix updating clipView

Browse source
This commit is contained in:
j 2016-11-27 19:41:10 +01:00
parent e288749077
commit 71c163f9fb
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
source/UI/js/Video/ClipPanel.js
View file

@ -71,6 +71,10 @@ Ox.ClipPanel = function(options, self) {
sort: getListSort(),
sortable: isSortable(),
});
},
view: function() {
updateView();
self.$menu.checkItem(self.options.view);
}
})
.bindEvent({
@ -219,20 +223,8 @@ Ox.ClipPanel = function(options, self) {
.bindEvent({
change: function(data) {
if (data.id == 'view') {
var action = self.options.editable
&& self.options.selected.length
&& data.checked[0].id != 'annotations'
? 'enableItem' : 'disableItem';
self.options.view = data.checked[0].id;
self.$menu[action]('split');
self.$menu[
self.options.editable
&& self.options.selected.length > 1
&& data.checked[0].id != 'annotations'
? 'enableItem' : 'disableItem'
]('join');
self.$menu[action]('replace');
self.$panel.replaceElement(1, self.$list = getList());
updateView();
that.triggerEvent('view', {view: self.options.view});
}
},
@ -657,6 +649,22 @@ Ox.ClipPanel = function(options, self) {
);
}
function updateView() {
var action = self.options.editable
&& self.options.selected.length
&& self.options.view != 'annotations'
? 'enableItem' : 'disableItem';
self.$menu[action]('split');
self.$menu[
self.options.editable
&& self.options.selected.length > 1
&& self.options.view != 'annotations'
? 'enableItem' : 'disableItem'
]('join');
self.$menu[action]('replace');
self.$panel.replaceElement(1, self.$list = getList());
}
that.getPasteIndex = function() {
return self.$list.getPasteIndex();
};

5
source/UI/js/Video/VideoEditPanel.js
View file

@ -69,6 +69,11 @@ Ox.VideoEditPanel = function(options, self) {
self.$mainPanel.resizeElement(1, self.options.clipSize);
resizeClips({size: self.options.clipSize});
},
clipView: function() {
self.$clipPanel.options({
view: self.options.clipView
});
},
duration: function() {
self.$timeline && self.$timeline.replaceWith(
self.$timeline = getTimeline()