From 2f223cfb5e31b5b16fd134205b931beb286a0b40 Mon Sep 17 00:00:00 2001
From: Julia Svinareva <julia.svinaryova@onlyoffice.com>
Date: Tue, 25 Feb 2020 12:05:23 +0300
Subject: [PATCH] [SSE] Move sheet: drag and drop

---
 apps/common/main/lib/component/TabBar.js          | 3 +++
 apps/spreadsheeteditor/main/app/view/Statusbar.js | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js
index 50b8158ce..7232697c8 100644
--- a/apps/common/main/lib/component/TabBar.js
+++ b/apps/common/main/lib/component/TabBar.js
@@ -240,6 +240,9 @@ define([
                             lockDrag = true;
                         }
                     });
+                    if (this.bar.selectTabs.length === this.bar.tabs.length || this.bar.tabs.length === 1) {
+                        lockDrag = true;
+                    }
                     this.bar.$el.find('ul > li > span').attr('draggable', !lockDrag);
                     tab.changeState();
                 } else {
diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js
index 2ebc4e4e5..02c814700 100644
--- a/apps/spreadsheeteditor/main/app/view/Statusbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js
@@ -202,6 +202,7 @@ define([
 
                     }, this),
                     'tab:dragstart': _.bind(function (dataTransfer, selectTabs) {
+                        this.api.asc_closeCellEditor();
                         var arrTabs = [],
                             arrName = [],
                             me = this;
@@ -238,7 +239,7 @@ define([
                          var data = dataTransfer.getData("onlyoffice");
                          if (data) {
                              var arrData = JSON.parse(data);
-                             if (arrData[0].type === 'onlyoffice') {
+                             if (arrData) {
                                  var key = _.findWhere(arrData, {type: 'key'}).value;
                                  if (Common.Utils.InternalSettings.get("sse-doc-info-key") === key) {
                                      this.api.asc_moveWorksheet(index, _.findWhere(arrData, {type: 'indexes'}).value);