[Pkg-mozext-commits] [tabmixplus] 14/61: Dragging bookmark or livemark from the Bookmarks toolbar always have 'copy' dropEffect
David Prévot
taffit at moszumanska.debian.org
Fri Aug 28 19:09:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 536d5815edebed1f963a7afbc1801838eb40cac6
Author: onemen <tabmix.onemen at gmail.com>
Date: Tue Jul 14 13:49:36 2015 +0300
Dragging bookmark or livemark from the Bookmarks toolbar always have 'copy' dropEffect
---
chrome/content/minit/minit.js | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/chrome/content/minit/minit.js b/chrome/content/minit/minit.js
index 87294a2..14e97b9 100644
--- a/chrome/content/minit/minit.js
+++ b/chrome/content/minit/minit.js
@@ -193,8 +193,7 @@ var TMP_tabDNDObserver = {
left_right = 1;
}
- var isCopy;
- isCopy = dt.dropEffect == "copy";
+ var isCopy = this.isCopyDropEffect(dt, event, draggeType);
var effects = this._setEffectAllowedForDataTransfer(event, draggeType);
var replaceTab = (left_right == -1);
@@ -320,7 +319,7 @@ var TMP_tabDNDObserver = {
var dt = event.dataTransfer;
var sourceNode = this.getSourceNode(dt);
var draggeType = this.getDragType(sourceNode);
- var isCopy = dt.dropEffect == "copy";
+ var isCopy = this.isCopyDropEffect(dt, event, draggeType);
var draggedTab;
if (draggeType != this.DRAG_LINK) {
draggedTab = sourceNode;
@@ -791,6 +790,18 @@ var TMP_tabDNDObserver = {
if (types[0] == this.TAB_DROP_TYPE)
return aDataTransfer.mozGetDataAt(this.TAB_DROP_TYPE, 0);
return null;
+ },
+
+ isCopyDropEffect: function(dt, event, type) {
+ let isCopy = dt.dropEffect == "copy";
+ if (isCopy && type == this.DRAG_LINK) {
+ // Dragging bookmark or livemark from the Bookmarks toolbar always have 'copy' dropEffect
+ let isCtrlKey = ((event.ctrlKey || event.metaKey) && !event.shiftKey && !event.altKey);
+ let draggingBookmark = !isCtrlKey && dt.effectAllowed == "copyLink" &&
+ dt.mozSourceNode && dt.mozSourceNode._placesNode;
+ return isCopy && !draggingBookmark;
+ }
+ return isCopy;
}
}; // TMP_tabDNDObserver end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list