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

bind e to show entity info

Browse source
This commit is contained in:
j 2015-04-17 13:06:35 +05:30
parent 4f7b9846d8
commit 160c38c361
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/UI/js/Video/AnnotationFolder.js
View file

@ -349,7 +349,7 @@ Ox.AnnotationFolder = function(options, self) {
[ [
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'b', 'backslash', 'closebracket', 'comma', 'dot', 'b', 'backslash', 'closebracket', 'comma', 'dot',
'equal', 'f', 'g', 'h', 'i', 'minus', 'n', 'o', 'equal', 'e', 'f', 'g', 'h', 'i', 'minus', 'n', 'o',
'openbracket', 'p', 'shift_0', 'shift_equal', 'openbracket', 'p', 'shift_0', 'shift_equal',
'shift_g', 'shift_i', 'shift_minus', 'shift_o', 'shift_g', 'shift_i', 'shift_minus', 'shift_o',
'slash', 'space' 'slash', 'space'

6
source/UI/js/Video/AnnotationPanel.js
View file

@ -268,7 +268,7 @@ Ox.AnnotationPanel = function(options, self) {
{id: 'annotation', title: annotationTitle, disabled: true} {id: 'annotation', title: annotationTitle, disabled: true}
].concat( ].concat(
isEntity ? [ isEntity ? [
{id: 'showentityinfo', title: Ox._('Show Entity Info')} {id: 'showentityinfo', title: Ox._('Show Entity Info'), keyboard: 'e'}
] : [], ] : [],
[ [
{id: 'findannotations', title: Ox._('Find in All {0}', [Ox.toTitleCase(self.options.itemName.plural)])}, {id: 'findannotations', title: Ox._('Find in All {0}', [Ox.toTitleCase(self.options.itemName.plural)])},
@ -385,6 +385,10 @@ Ox.AnnotationPanel = function(options, self) {
that.triggerEvent('info', {layer: layer.id}); that.triggerEvent('info', {layer: layer.id});
}, },
insert: insert, insert: insert,
key_e: function(data) {
var entity = getAnnotation(self.options.selected).entity;
entity && that.triggerEvent('showentityinfo', entity);
},
open: function() { open: function() {
that.triggerEvent('open'); that.triggerEvent('open');
}, },