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

clicking inside in/out input element should not move focus to editor, fixes #3032

Browse source
This commit is contained in:
j 2017-07-08 11:31:12 +02:00
parent 21c94c00a9
commit a579f47a27
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/UI/js/Video/VideoAnnotationPanel.js
View file

@ -373,7 +373,13 @@ Ox.VideoAnnotationPanel = function(options, self) {
.on({ .on({
mousedown: function(e) { mousedown: function(e) {
var $target = $(e.target); var $target = $(e.target);
!$target.is('.OxPosition') && !$target.is('input') && that.gainFocus(); if (!$target.is('.OxPosition') && !$target.is('input')) {
that.gainFocus();
}
// ignore mousedown inside a focused input element
if ($target.is('.OxKeyboardFocus')) {
return;
}
// the following is needed to determine // the following is needed to determine
// how to handle annotation input blur // how to handle annotation input blur
if (self.editing) { if (self.editing) {

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

@ -891,7 +891,7 @@ Ox.VideoPlayer = function(options, self) {
self.$positionInput.children('input').css({ self.$positionInput.children('input').css({
width: (self.positionWidth - 6) + 'px', width: (self.positionWidth - 6) + 'px',
fontSize: '9px' fontSize: '9px'
}); });
} else if (control == 'previous') { } else if (control == 'previous') {