From 8e1a19dca27dfe73c5e0f92f509c1c545d748e0a Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 30 Nov 2017 11:25:11 -0500 Subject: [PATCH] (js) Force copy of dragged contacts from remote AB --- NEWS | 1 + UI/WebServerResources/js/Common/sgDraggable.directive.js | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index b93ab715c..32adff4cb 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,7 @@ Bug fixes - [web] fixed mail composition from message headers (#4335) - [web] restore messages selection after automatic refresh (#4330) - [web] fixed path of destination mailbox in Sieve filter editor + - [web] force copy of dragged contacts from global address books - [eas] hebrew folders encoding problem using EAS (#4240) - [eas] avoid sync requests for shared folders every second (#4275) diff --git a/UI/WebServerResources/js/Common/sgDraggable.directive.js b/UI/WebServerResources/js/Common/sgDraggable.directive.js index 71dba31e8..fa8a35cd9 100644 --- a/UI/WebServerResources/js/Common/sgDraggable.directive.js +++ b/UI/WebServerResources/js/Common/sgDraggable.directive.js @@ -120,7 +120,7 @@ $rootScope.$emit('folder:dragstart', this.folder); } if (this.dragHasStarted) { - if (ev.shiftKey) + if (ev.shiftKey || this.folder.isRemote) this.helper.addClass('sg-draggable-helper--copy'); else this.helper.removeClass('sg-draggable-helper--copy'); @@ -130,12 +130,16 @@ onDragEnd: function(ev) { + var action = 'move'; + this.startPosition = null; $document.off('mousemove', this.bindedOnDrag); if (this.dragHasStarted) { + if (ev.shiftKey || this.folder.isRemote) + action = 'copy'; $log.debug('emit folder:dragend'); - $rootScope.$emit('folder:dragend', this.folder, ev.shiftKey?'copy':'move'); + $rootScope.$emit('folder:dragend', this.folder, action); this.dragHasStarted = false; this.helper.addClass('ng-hide'); }