don't show tooltip while editing an arrayeditable
This commit is contained in:
parent
a5f7dd720a
commit
d3d7427bfe
2 changed files with 4 additions and 2 deletions
|
@ -229,6 +229,7 @@ Ox.ArrayEditable = function(options, self) {
|
|||
selectItem(item.id);
|
||||
}
|
||||
self.editing = true;
|
||||
that.$tooltip && that.$tooltip.options({title: ''});
|
||||
that.triggerEvent('edit');
|
||||
},
|
||||
insert: function(data) {
|
||||
|
@ -376,7 +377,7 @@ Ox.ArrayEditable = function(options, self) {
|
|||
isLink = $target.closest('a').length,
|
||||
click = isLink ? 'Shift-click' : 'Click',
|
||||
doubleclick = isLink ? 'shift-doubleclick' : 'doubleclick';
|
||||
return item === undefined
|
||||
return item === undefined || self.editing
|
||||
? ''
|
||||
: (
|
||||
self.options.tooltipText
|
||||
|
@ -443,6 +444,7 @@ Ox.ArrayEditable = function(options, self) {
|
|||
if (self.options.editable && self.options.selected) {
|
||||
self.editing = true;
|
||||
self.$items[self.selected].options({editing: true});
|
||||
that.$tooltip && that.$tooltip.options({title: ''});
|
||||
} else if (!self.options.editable) {
|
||||
that.triggerEvent('open');
|
||||
}
|
||||
|
|
|
@ -325,7 +325,7 @@ Ox.AnnotationFolder = function(options, self) {
|
|||
that.triggerEvent('add', {value: data.value || ''});
|
||||
},
|
||||
blur: function(data) {
|
||||
if (data.id[0] == '_') {
|
||||
if (data && data.id[0] == '_') {
|
||||
changeAnnotation(data);
|
||||
} else {
|
||||
// the video editor will, if it has not received focus,
|
||||
|
|
Loading…
Reference in a new issue