CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-04 22:18:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

suppressMenu(true) is now the default

Browse Source
This commit is contained in:
Bryan Housel
2017-02-21 15:47:22 -05:00
parent d8237fa3eb
commit e756520bd8
15 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/behavior/select.js
+7 -7
View File
@@ -23,8 +23,8 @@ export function behaviorSelect(context) {
function click() {
var rtClick = d3.event.type === 'contextmenu';
var rtClick = d3.event.type === 'contextmenu';
if (rtClick) {
d3.event.preventDefault();
}
@@ -40,21 +40,21 @@ export function behaviorSelect(context) {
context.enter(modeBrowse(context));
} else if (!d3.event.shiftKey && !lasso) {
// Reselect when 'rtClick on one of the selectedIDs'
// Reselect when 'rtClick on one of the selectedIDs'
// OR 'leftClick on the same singular selected entity'
// Explanation: leftClick should discard any multiple
// selection of entities and make the selection singlular.
// Whereas rtClick should preserve multiple selection of
// Whereas rtClick should preserve multiple selection of
// entities if and only if it clicks on one of the selectedIDs.
if (context.selectedIDs().indexOf(datum.id) >= 0
&& (rtClick || context.selectedIDs().length === 1)) {
if (context.selectedIDs().indexOf(datum.id) >= 0 &&
(rtClick || context.selectedIDs().length === 1)) {
mode.suppressMenu(false).reselect();
} else {
context.enter(modeSelect(context, [datum.id]));
}
} else if (context.selectedIDs().indexOf(datum.id) >= 0) {
if (rtClick) { // To prevent datum.id from being removed when rtClick
mode.suppressMenu(false).reselect();
mode.suppressMenu(false).reselect();
} else {
var selectedIDs = _.without(context.selectedIDs(), datum.id);
context.enter(selectedIDs.length ? modeSelect(context, selectedIDs) : modeBrowse(context));