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

Compare commits

base: 0x2620:c2d35e615defb9b7d814d637bb330af77380f956
Branches Tags
0x2620:master
0x2620:maplibre
0x2620:maplibre-big-bbox
0x2620:maplibre-fix-editing
0x2620:stable
0x2620:leaflet
..
compare: 0x2620:290afaf332be1e84e2bf66551546af164edffda6
Branches Tags
0x2620:master
0x2620:maplibre
0x2620:maplibre-big-bbox
0x2620:maplibre-fix-editing
0x2620:stable
0x2620:leaflet

No commits in common. "c2d35e615defb9b7d814d637bb330af77380f956" and "290afaf332be1e84e2bf66551546af164edffda6" have entirely different histories.
c2d35e615d ... 290afaf332

2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -325,7 +325,7 @@ Ox.AnnotationFolder = function(options, self) {
that.triggerEvent('add', {value: data.value || ''}); that.triggerEvent('add', {value: data.value || ''});
}, },
blur: function(data) { blur: function(data) {
if (data && data.id && data.id[0] == '_') { if (data && data.id[0] == '_') {
changeAnnotation(data); changeAnnotation(data);
that.triggerEvent('blur'); that.triggerEvent('blur');
} else { } else {

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

@ -938,7 +938,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
that.triggerEvent('resizemap', data); that.triggerEvent('resizemap', data);
}, },
select: function(data) { select: function(data) {
selectAnnotation(data, !self.updating); selectAnnotation(data, true);
}, },
showentityinfo: function(data) { showentityinfo: function(data) {
that.triggerEvent('showentityinfo', data); that.triggerEvent('showentityinfo', data);
@ -1340,7 +1340,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
that.triggerEvent('annotationssize', {size: data.size}); that.triggerEvent('annotationssize', {size: data.size});
} }
function selectAnnotation(data, moveToPosition) { function selectAnnotation(data, stayAtPosition) {
if (Ox.isUndefined(data)) { if (Ox.isUndefined(data)) {
// doubleclick on small timeline // doubleclick on small timeline
data = getAnnotation(); data = getAnnotation();
@ -1351,11 +1351,13 @@ Ox.VideoAnnotationPanel = function(options, self) {
// FIXME // FIXME
// self.editing = false; // self.editing = false;
if (data.id) { if (data.id) {
var outOfRange = self.options.annotationsRange != 'position' && ( if (!stayAtPosition || (
self.options.position < data['in'] self.options.annotationsRange != 'position' && (
|| self.options.position > data.out self.options.position < data['in']
) || self.options.position > data.out
if (moveToPosition && outOfRange) { )
)
) {
setPosition(data['in']); setPosition(data['in']);
// if annotationsRange is 'position', // if annotationsRange is 'position',
// this may cause a deselect // this may cause a deselect
@ -1715,7 +1717,6 @@ Ox.VideoAnnotationPanel = function(options, self) {
(id, annotation) -> <o> update annotation with id (id, annotation) -> <o> update annotation with id
@*/ @*/
that.updateAnnotation = function(id, annotation) { that.updateAnnotation = function(id, annotation) {
self.updating = true
// called from editannotation callback // called from editannotation callback
// id might have changed if new annotation was created // id might have changed if new annotation was created
if (annotation.id) { if (annotation.id) {
@ -1729,7 +1730,6 @@ Ox.VideoAnnotationPanel = function(options, self) {
self.annotations = getAnnotations(); self.annotations = getAnnotations();
setTimelineState(); setTimelineState();
} }
self.updating = false
}; };
/*@ /*@