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

don't show tooltip while editing an arrayeditable

Browse source
This commit is contained in:
rolux 2018-10-09 18:56:30 +02:00
parent a5f7dd720a
commit d3d7427bfe
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/UI/js/Form/ArrayEditable.js
View file

@ -229,6 +229,7 @@ Ox.ArrayEditable = function(options, self) {
selectItem(item.id); selectItem(item.id);
} }
self.editing = true; self.editing = true;
that.$tooltip && that.$tooltip.options({title: ''});
that.triggerEvent('edit'); that.triggerEvent('edit');
}, },
insert: function(data) { insert: function(data) {
@ -376,7 +377,7 @@ Ox.ArrayEditable = function(options, self) {
isLink = $target.closest('a').length, isLink = $target.closest('a').length,
click = isLink ? 'Shift-click' : 'Click', click = isLink ? 'Shift-click' : 'Click',
doubleclick = isLink ? 'shift-doubleclick' : 'doubleclick'; doubleclick = isLink ? 'shift-doubleclick' : 'doubleclick';
return item === undefined return item === undefined || self.editing
? '' ? ''
: ( : (
self.options.tooltipText self.options.tooltipText
@ -443,6 +444,7 @@ Ox.ArrayEditable = function(options, self) {
if (self.options.editable && self.options.selected) { if (self.options.editable && self.options.selected) {
self.editing = true; self.editing = true;
self.$items[self.selected].options({editing: true}); self.$items[self.selected].options({editing: true});
that.$tooltip && that.$tooltip.options({title: ''});
} else if (!self.options.editable) { } else if (!self.options.editable) {
that.triggerEvent('open'); that.triggerEvent('open');
} }

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.id[0] == '_') { if (data && data.id[0] == '_') {
changeAnnotation(data); changeAnnotation(data);
} else { } else {
// the video editor will, if it has not received focus, // the video editor will, if it has not received focus,