From cb9b82e0f000cab401c00eca08a288196993236d Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Mon, 10 Jul 2017 18:32:33 +0300
Subject: [PATCH] [Common] refactoring

---
 apps/common/main/lib/component/Mixtbar.js         | 15 ++++++++-------
 .../documenteditor/main/app/controller/Toolbar.js |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js
index 0798a0fe9..a39acc421 100644
--- a/apps/common/main/lib/component/Mixtbar.js
+++ b/apps/common/main/lib/component/Mixtbar.js
@@ -73,7 +73,7 @@ define([
             if ( this.isFolded ) {
                 if ( $(e.target).parents('.toolbar').length ){
                 } else {
-                    this.collapseToolbar();
+                    this.collapse();
                 }
             }
         }
@@ -125,7 +125,7 @@ define([
                     optsFold.$bar.addClass('folded');
                     optsFold.$box.on({
                         mouseleave: function (e) {
-                            optsFold.timer = setTimeout(me.collapseToolbar, optsFold.timeout);
+                            optsFold.timer = setTimeout(me.collapse, optsFold.timeout);
                         },
                         mouseenter: function (e) {
                             clearTimeout(optsFold.timer);
@@ -163,7 +163,7 @@ define([
                 }
             },
 
-            collapseToolbar: function() {
+            collapse: function() {
                 if ( this.isFolded && optsFold.$bar ) {
                     optsFold.$bar.removeClass('expanded');
                     optsFold.$bar.find('.tabs .ribtab').removeClass('active');
@@ -172,11 +172,11 @@ define([
                 Common.UI.Menu.Manager.hideAll();
             },
 
-            expandToolbar: function() {
+            expand: function() {
                 clearTimeout(optsFold.timer);
 
                 optsFold.$bar.addClass('expanded');
-                optsFold.timer = setTimeout(this.collapseToolbar, optsFold.timeout);
+                optsFold.timer = setTimeout(this.collapse, optsFold.timeout);
             },
 
             onResize: function(e) {
@@ -213,10 +213,11 @@ define([
                     }
 
                     if ( panel.length ) {
-                        if ( this.isFolded ) this.expandToolbar();
+                        if ( this.isFolded ) this.expand();
                     } else {
                         onShowFullviewPanel.call(this, true);
-                        if ( this.isFolded ) this.collapseToolbar();
+                        if ( this.isFolded ) this.collapse();
+                    }
                     }
                 }
             },
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 54b2cae73..0d35c9713 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -347,7 +347,7 @@ define([
         },
 
         onContextMenu: function() {
-            this.toolbar.collapseToolbar();
+            this.toolbar.collapse();
         },
 
         onApiFontSize: function(size) {