From 28008da7c02c8c905d25fd4a25ae7b7aa47ee17a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 21 Feb 2019 13:40:03 +0300 Subject: [PATCH] Fix Bug 40653 --- apps/documenteditor/main/app/controller/Main.js | 9 +++++++++ apps/presentationeditor/main/app/controller/Main.js | 9 +++++++++ apps/spreadsheeteditor/main/app/controller/Main.js | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index d1a306fc5..55768f207 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -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({ diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 3a75f5021..083c69e03 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -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({ diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 146c9695d..41f7e34c5 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -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({