From 3eb5c229ec9e835f000acbca8752dbe49fedd81c Mon Sep 17 00:00:00 2001 From: rolux Date: Sat, 8 Feb 2014 20:13:10 +0000 Subject: [PATCH] clip panel: fix menu item disabling when switching back from annotations view --- source/Ox.UI/js/Video/ClipPanel.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/Ox.UI/js/Video/ClipPanel.js b/source/Ox.UI/js/Video/ClipPanel.js index b9175cc1..906fc6ef 100644 --- a/source/Ox.UI/js/Video/ClipPanel.js +++ b/source/Ox.UI/js/Video/ClipPanel.js @@ -192,7 +192,12 @@ Ox.ClipPanel = function(options, self) { ? 'enableItem' : 'disableItem'; self.options.view = data.checked[0].id; self.$menu[action]('split'); - self.$menu[action]('join'); + 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()); that.triggerEvent('view', {view: self.options.view});