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

dont move position is it is inside selection

Browse source
This commit is contained in:
j 2018-03-31 18:07:21 +05:30
parent 92ff15c5df
commit 2a389cfb40
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1318,10 +1318,12 @@ Ox.VideoAnnotationPanel = function(options, self) {
// FIXME
// self.editing = false;
if (data.id) {
if (!stayAtPosition
|| self.options.annotationsRange != 'position'
|| self.options.position < data['in']
|| self.options.position > data.out
if (!stayAtPosition || (
self.options.annotationsRange != 'position' && (
self.options.position < data['in']
|| self.options.position > data.out
)
)
) {
setPosition(data['in']);
// if annotationsRange is 'position',