From d3d7427bfed3188e77a52a01593fd5ba6c9c0ad7 Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Tue, 9 Oct 2018 18:56:30 +0200
Subject: [PATCH] don't show tooltip while editing an arrayeditable

---
 source/UI/js/Form/ArrayEditable.js     | 4 +++-
 source/UI/js/Video/AnnotationFolder.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/UI/js/Form/ArrayEditable.js b/source/UI/js/Form/ArrayEditable.js
index d6157c6e..9da672ce 100644
--- a/source/UI/js/Form/ArrayEditable.js
+++ b/source/UI/js/Form/ArrayEditable.js
@@ -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');
         }
diff --git a/source/UI/js/Video/AnnotationFolder.js b/source/UI/js/Video/AnnotationFolder.js
index c313b217..a92d10c0 100644
--- a/source/UI/js/Video/AnnotationFolder.js
+++ b/source/UI/js/Video/AnnotationFolder.js
@@ -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,