diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 681b0d0a6..9c5477232 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -217,6 +217,8 @@ define([ $(document.body).on('blur', 'input, textarea', function(e) { if (!me.isModalShowed) { + if (/form-control/.test(e.target.className)) + me.inFormControl = false; if (!e.relatedTarget || !/area_id/.test(e.target.id) && ($(e.target).parent().find(e.relatedTarget).length<1 || e.target.localName == 'textarea') /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */ && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */ @@ -228,8 +230,6 @@ define([ me.dontCloseDummyComment = false; else if (/chat-msg-text/.test(e.target.id)) me.dontCloseChat = false; - else if (/form-control/.test(e.target.className)) - me.inFormControl = false; } } }).on('dragover', function(e) { diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index a8765bc2e..2423b3e5a 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -198,6 +198,8 @@ define([ $(document.body).on('blur', 'input, textarea', function(e) { if (!me.isModalShowed) { + if (/form-control/.test(e.target.className)) + me.inFormControl = false; if (!e.relatedTarget || !/area_id/.test(e.target.id) && ($(e.target).parent().find(e.relatedTarget).length<1 || e.target.localName == 'textarea') /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */ && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */ @@ -209,8 +211,6 @@ define([ me.dontCloseDummyComment = false; else if (/chat-msg-text/.test(e.target.id)) me.dontCloseChat = false; - else if (/form-control/.test(e.target.className)) - me.inFormControl = false; } } }).on('dragover', function(e) { diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index a3dfb9896..0534ef5b9 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -206,6 +206,8 @@ define([ if (me.isAppDisabled === true || me.isFrameClosed) return; if (!me.isModalShowed && !(me.loadMask && me.loadMask.isVisible())) { + if (/form-control/.test(e.target.className)) + me.inFormControl = false; if (!e.relatedTarget || !/area_id/.test(e.target.id) && ($(e.target).parent().find(e.relatedTarget).length<1 || e.target.localName == 'textarea') /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */ && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */ @@ -217,8 +219,6 @@ define([ me.dontCloseDummyComment = false; else if (/chat-msg-text/.test(e.target.id)) me.dontCloseChat = false; - else if (/form-control/.test(e.target.className)) - me.inFormControl = false; } } }).on('dragover', function(e) {