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

Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps-pro into develop

Browse source
This commit is contained in:
Kirill Volkov 2019-02-21 15:07:53 +03:00
parent b239a11275 28008da7c0
commit 0221305640
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/main/app/controller/Main.js
View file

@ -241,6 +241,15 @@ define([
event.dataTransfer.dropEffect ="none";
return false;
}
}).on('dragstart', function(e) {
var event = e.originalEvent;
if (event.target ) {
var target = $(event.target);
if (target.closest('.combobox').length>0 || target.closest('.dropdown-menu').length>0 ||
target.closest('.ribtab').length>0 || target.closest('.combo-dataview').length>0) {
event.preventDefault();
}
}
});
Common.NotificationCenter.on({

9
apps/presentationeditor/main/app/controller/Main.js
View file

@ -228,6 +228,15 @@ define([
event.dataTransfer.dropEffect ="none";
return false;
}
}).on('dragstart', function(e) {
var event = e.originalEvent;
if (event.target ) {
var target = $(event.target);
if (target.closest('.combobox').length>0 || target.closest('.dropdown-menu').length>0 ||
target.closest('.ribtab').length>0 || target.closest('.combo-dataview').length>0) {
event.preventDefault();
}
}
});
Common.NotificationCenter.on({

9
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -230,6 +230,15 @@ define([
event.dataTransfer.dropEffect ="none";
return false;
}
}).on('dragstart', function(e) {
var event = e.originalEvent;
if (event.target ) {
var target = $(event.target);
if (target.closest('.combobox').length>0 || target.closest('.dropdown-menu').length>0 ||
target.closest('.ribtab').length>0 || target.closest('.combo-dataview').length>0) {
event.preventDefault();
}
}
});
Common.NotificationCenter.on({