Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #72 from ONLYOFFICE/feature/bugfix

Browse source 
Fix Bug 37308
This commit is contained in:
Alexey Golubev 2018-03-26 16:56:17 +03:00 committed by GitHub
parent 7f563ce262 c9cc95064d
commit 6bf2d22958
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/main/app/controller/Main.js
View file

@ -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) {

4
apps/presentationeditor/main/app/controller/Main.js
View file

@ -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) {

4
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -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) {