0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

enable/disable show/hide menu options and keyboard shortcuts correctly

Browse source
This commit is contained in:
rolux 2011-11-02 06:48:45 +00:00
parent 4eb710fd01
commit b85a637486
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
static/js/pandora/itemClips.js
View file

@ -23,6 +23,7 @@ pandora.ui.itemClips = function(options) {
self.height = self.options.ratio > 1 ? Math.round(self.size / self.options.ratio) : self.size; self.height = self.options.ratio > 1 ? Math.round(self.size / self.options.ratio) : self.size;
self.options.clips.forEach(function(clip, i) { self.options.clips.forEach(function(clip, i) {
Ox.print('CLIP', clip)
var id = self.options.id + '/' + clip['in'], var id = self.options.id + '/' + clip['in'],
title = Ox.map(clip.annotations, function(annotation) { title = Ox.map(clip.annotations, function(annotation) {
return annotation.layer == 'subtitles' ? annotation.value : 0 return annotation.layer == 'subtitles' ? annotation.value : 0

12
static/js/pandora/menu.js
View file

@ -96,7 +96,7 @@ pandora.ui.mainMenu = function() {
] }, ] },
{}, {},
{ id: 'showsidebar', title: (ui.showSidebar ? 'Hide' : 'Show') + ' Sidebar', keyboard: 'shift s' }, { id: 'showsidebar', title: (ui.showSidebar ? 'Hide' : 'Show') + ' Sidebar', keyboard: 'shift s' },
{ id: 'showinfo', title: (ui.showInfo ? 'Hide' : 'Show') + ' Info', keyboard: 'shift i' }, { id: 'showinfo', title: (ui.showInfo ? 'Hide' : 'Show') + ' Info', disabled: !ui.showSidebar, keyboard: 'shift i' },
{ id: 'showgroups', title: (ui.showGroups ? 'Hide' : 'Show') + ' Groups', disabled: !!ui.item, keyboard: 'shift g' }, { id: 'showgroups', title: (ui.showGroups ? 'Hide' : 'Show') + ' Groups', disabled: !!ui.item, keyboard: 'shift g' },
{ id: 'showbrowser', title: (ui.showBrowser ? 'Hide' : 'Show') + ' ' + pandora.site.itemName.singular + ' Browser', disabled: !ui.item, keyboard: 'shift b' }, { id: 'showbrowser', title: (ui.showBrowser ? 'Hide' : 'Show') + ' ' + pandora.site.itemName.singular + ' Browser', disabled: !ui.item, keyboard: 'shift b' },
{ id: 'showannotations', title: (ui.showAnnotations ? 'Hide' : 'Show') + ' Annotations', disabled: !ui.item || ['timeline', 'video'].indexOf(ui.itemView) == -1, keyboard: 'shift a' }, { id: 'showannotations', title: (ui.showAnnotations ? 'Hide' : 'Show') + ' Annotations', disabled: !ui.item || ['timeline', 'video'].indexOf(ui.itemView) == -1, keyboard: 'shift a' },
@ -282,16 +282,17 @@ pandora.ui.mainMenu = function() {
} }
}, },
key_shift_a: function() { key_shift_a: function() {
pandora.UI.set({showAnnotations: !ui.showAnnotations}); ui.item && ['video', 'timeline'].indexOf(ui.view) > -1
&& pandora.UI.set({showAnnotations: !ui.showAnnotations});
}, },
key_shift_b: function() { key_shift_b: function() {
pandora.UI.set({showBrowser: !ui.showBrowser}); ui.item && pandora.UI.set({showBrowser: !ui.showBrowser});
}, },
key_shift_g: function() { key_shift_g: function() {
pandora.UI.set({showGroups: !ui.showGroups}); !ui.item && pandora.UI.set({showGroups: !ui.showGroups});
}, },
key_shift_i: function() { key_shift_i: function() {
pandora.UI.set({showInfo: !ui.showInfo}); ui.showSidebar && pandora.UI.set({showInfo: !ui.showInfo});
}, },
key_shift_s: function() { key_shift_s: function() {
pandora.UI.set({showSidebar: !ui.showSidebar}); pandora.UI.set({showSidebar: !ui.showSidebar});
@ -350,6 +351,7 @@ pandora.ui.mainMenu = function() {
}, },
pandora_showsidebar: function(data) { pandora_showsidebar: function(data) {
that.setItemTitle('showsidebar', (data.value ? 'Hide' : 'Show') + ' Sidebar'); that.setItemTitle('showsidebar', (data.value ? 'Hide' : 'Show') + ' Sidebar');
that[data.value ? 'enableItem' : 'disableItem']('showinfo');
} }
}); });