From 811757a8bcc4dc680def3a6b891ef5bdab098612 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 29 Sep 2016 16:26:05 +0300
Subject: [PATCH] Show shape (not text art) settings in the right panel when
 selecting shape or text art. Show text art settings when adding text art to
 document.

---
 apps/common/main/lib/util/utils.js                   | 10 +++++-----
 apps/documenteditor/main/app/controller/RightMenu.js |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
index 00be00ea2..26b80a9df 100644
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@@ -96,11 +96,11 @@ Common.Utils = _.extend(new(function() {
             Table      : 1,
             Image      : 2,
             Header     : 3,
-            Shape      : 4,
-            Slide      : 5,
-            Chart      : 6,
-            MailMerge  : 7,
-            TextArt    : 8
+            TextArt    : 4,
+            Shape      : 5,
+            Slide      : 6,
+            Chart      : 7,
+            MailMerge  : 8
         },
         me = this,
         checkSize = function() {
diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js
index 0539710de..8508b08a1 100644
--- a/apps/documenteditor/main/app/controller/RightMenu.js
+++ b/apps/documenteditor/main/app/controller/RightMenu.js
@@ -212,8 +212,6 @@ define([
 
             this._settings[Common.Utils.documentSettingsType.Image].needShow = false;
             this._settings[Common.Utils.documentSettingsType.Chart].needShow = false;
-            this._settings[Common.Utils.documentSettingsType.Shape].needShow = false;
-            this._settings[Common.Utils.documentSettingsType.TextArt].needShow = false;
         },
 
         onCoAuthoringDisconnect: function() {