Merge pull request #73 from ONLYOFFICE/release/v5.1.0

Release/v5.1.0

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

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

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

apps/spreadsheeteditor/main/app/controller/Statusbar.js

@@ -244,15 +244,21 @@ define([
         },
 
         onTabMenu: function(obj, item, e) {
+            var me = this;
             switch (item.value){
             case 'ins':
-                this.api.asc_insertWorksheet(this.createSheetName());
+                setTimeout(function(){
+                    me.api.asc_insertWorksheet(me.createSheetName());
+                }, 1);
                 break;
             case 'del':     this.deleteWorksheet(); break;
             case 'ren':     this.renameWorksheet(); break;
             case 'copy':    this.moveWorksheet(false); break;
             case 'move':    this.moveWorksheet(true); break;
-            case 'hide':    this.hideWorksheet(true); break;
+            case 'hide':
+                setTimeout(function(){
+                    me.hideWorksheet(true);}, 1);
+                break;
             }
         },