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

[SSE] Fix bug 46578 (#506)

Browse source
This commit is contained in:
JuliaSvinareva 2020-09-15 23:56:33 +03:00 committed by GitHub
parent 6f9f377e2d
commit 2e05393d64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/common/main/lib/component/TabBar.js
View file

@ -275,19 +275,27 @@ define([
this.bar.trigger('tab:dragstart', event.dataTransfer, this.bar.selectTabs); this.bar.trigger('tab:dragstart', event.dataTransfer, this.bar.selectTabs);
}, this), }, this),
dragenter: $.proxy(function (e) { dragenter: $.proxy(function (e) {
this.bar.$el.find('.mousemove').removeClass('mousemove right');
$(e.currentTarget).parent().addClass('mousemove');
var event = e.originalEvent; var event = e.originalEvent;
var data = event.dataTransfer.getData("onlyoffice"); if (!this.bar.isEditFormula) {
event.dataTransfer.dropEffect = data ? 'move' : 'none'; this.bar.$el.find('.mousemove').removeClass('mousemove right');
$(e.currentTarget).parent().addClass('mousemove');
var data = event.dataTransfer.getData("onlyoffice");
event.dataTransfer.dropEffect = data ? 'move' : 'none';
} else {
event.dataTransfer.dropEffect = 'none';
}
}, this), }, this),
dragover: $.proxy(function (e) { dragover: $.proxy(function (e) {
var event = e.originalEvent; var event = e.originalEvent;
if (event.preventDefault) { if (event.preventDefault) {
event.preventDefault(); // Necessary. Allows us to drop. event.preventDefault(); // Necessary. Allows us to drop.
} }
this.bar.$el.find('.mousemove').removeClass('mousemove right'); if (!this.bar.isEditFormula) {
$(e.currentTarget).parent().addClass('mousemove'); this.bar.$el.find('.mousemove').removeClass('mousemove right');
$(e.currentTarget).parent().addClass('mousemove');
} else {
event.dataTransfer.dropEffect = 'none';
}
return false; return false;
}, this), }, this),
dragleave: $.proxy(function (e) { dragleave: $.proxy(function (e) {
@ -349,14 +357,14 @@ define([
}, this)); }, this));
addEvent(this.$bar[0], 'dragenter', _.bind(function (event) { addEvent(this.$bar[0], 'dragenter', _.bind(function (event) {
var data = event.dataTransfer.getData("onlyoffice"); var data = event.dataTransfer.getData("onlyoffice");
event.dataTransfer.dropEffect = data ? 'move' : 'none'; event.dataTransfer.dropEffect = (!this.isEditFormula && data) ? 'move' : 'none';
}, this)); }, this));
addEvent(this.$bar[0], 'dragover', _.bind(function (event) { addEvent(this.$bar[0], 'dragover', _.bind(function (event) {
if (event.preventDefault) { if (event.preventDefault) {
event.preventDefault(); // Necessary. Allows us to drop. event.preventDefault(); // Necessary. Allows us to drop.
} }
event.dataTransfer.dropEffect = 'move'; event.dataTransfer.dropEffect = !this.isEditFormula ? 'move' : 'none';
this.tabs[this.tabs.length - 1].$el.addClass('mousemove right'); !this.isEditFormula && this.tabs[this.tabs.length - 1].$el.addClass('mousemove right');
return false; return false;
}, this)); }, this));
addEvent(this.$bar[0], 'dragleave', _.bind(function (event) { addEvent(this.$bar[0], 'dragleave', _.bind(function (event) {

1
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -238,6 +238,7 @@ define([
this.dropTabs = selectTabs; this.dropTabs = selectTabs;
}, this), }, this),
'tab:drop': _.bind(function (dataTransfer, index) { 'tab:drop': _.bind(function (dataTransfer, index) {
if (this.isEditFormula) return;
var data = dataTransfer.getData("onlyoffice"); var data = dataTransfer.getData("onlyoffice");
if (data) { if (data) {
var arrData = JSON.parse(data); var arrData = JSON.parse(data);