diff --git a/source/UI/js/Video/VideoAnnotationPanel.js b/source/UI/js/Video/VideoAnnotationPanel.js index 9f35eea6..530d6b96 100644 --- a/source/UI/js/Video/VideoAnnotationPanel.js +++ b/source/UI/js/Video/VideoAnnotationPanel.js @@ -373,7 +373,13 @@ Ox.VideoAnnotationPanel = function(options, self) { .on({ mousedown: function(e) { 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 // how to handle annotation input blur if (self.editing) { diff --git a/source/UI/js/Video/VideoPlayer.js b/source/UI/js/Video/VideoPlayer.js index 52db92aa..0ffaab2b 100644 --- a/source/UI/js/Video/VideoPlayer.js +++ b/source/UI/js/Video/VideoPlayer.js @@ -891,7 +891,7 @@ Ox.VideoPlayer = function(options, self) { self.$positionInput.children('input').css({ width: (self.positionWidth - 6) + 'px', fontSize: '9px' - }); + }); } else if (control == 'previous') {