From 02f8849bd083c86e63e9c1fa952f7e17181aec4e Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 5 Jun 2020 14:22:50 -0400 Subject: [PATCH] Properly disable more operations for single nodes that aren't visible --- modules/operations/copy.js | 2 +- modules/operations/delete.js | 2 +- modules/operations/extract.js | 2 +- modules/operations/move.js | 2 +- modules/operations/orthogonalize.js | 2 +- modules/operations/reflect.js | 2 +- modules/operations/rotate.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/operations/copy.js b/modules/operations/copy.js index a58724169..6a4248a0d 100644 --- a/modules/operations/copy.js +++ b/modules/operations/copy.js @@ -113,7 +113,7 @@ export function operationCopy(context, selectedIDs) { var extent = nodes.reduce(function(extent, node) { return extent.extend(node.extent(context.graph())); }, geoExtent()); - if (extent.area() && extent.percentContainedIn(context.map().extent()) < 0.8) { + if (extent.percentContainedIn(context.map().extent()) < 0.8) { return 'too_large'; } return false; diff --git a/modules/operations/delete.js b/modules/operations/delete.js index 1ff66aa84..43238eaaf 100644 --- a/modules/operations/delete.js +++ b/modules/operations/delete.js @@ -72,7 +72,7 @@ export function operationDelete(context, selectedIDs) { operation.disabled = function() { - if (extent.area() && extent.percentContainedIn(context.map().extent()) < 0.8) { + if (extent.percentContainedIn(context.map().extent()) < 0.8) { return 'too_large'; } else if (someMissing()) { return 'not_downloaded'; diff --git a/modules/operations/extract.js b/modules/operations/extract.js index 8834853c5..8e080bbe3 100644 --- a/modules/operations/extract.js +++ b/modules/operations/extract.js @@ -57,7 +57,7 @@ export function operationExtract(context, selectedIDs) { operation.disabled = function () { - if (_extent && _extent.area() && _extent.percentContainedIn(context.map().extent()) < 0.8) { + if (_extent && _extent.percentContainedIn(context.map().extent()) < 0.8) { return 'too_large'; } else if (selectedIDs.some(function(entityID) { return context.graph().geometry(entityID) === 'vertex' && context.hasHiddenConnections(entityID); diff --git a/modules/operations/move.js b/modules/operations/move.js index b2ae57016..3a25f264c 100644 --- a/modules/operations/move.js +++ b/modules/operations/move.js @@ -26,7 +26,7 @@ export function operationMove(context, selectedIDs) { operation.disabled = function() { - if (extent.area() && extent.percentContainedIn(context.map().extent()) < 0.8) { + if (extent.percentContainedIn(context.map().extent()) < 0.8) { return 'too_large'; } else if (someMissing()) { return 'not_downloaded'; diff --git a/modules/operations/orthogonalize.js b/modules/operations/orthogonalize.js index d5ad69d17..cb4a1a382 100644 --- a/modules/operations/orthogonalize.js +++ b/modules/operations/orthogonalize.js @@ -89,7 +89,7 @@ export function operationOrthogonalize(context, selectedIDs) { return 'multiple_blockers'; } return actionDisableds[0]; - } else if (_type !== 'corner' && + } else if (_extent && _extent.percentContainedIn(context.map().extent()) < 0.8) { return 'too_large'; } else if (someMissing()) { diff --git a/modules/operations/reflect.js b/modules/operations/reflect.js index 22b7534b6..36ffa554f 100644 --- a/modules/operations/reflect.js +++ b/modules/operations/reflect.js @@ -44,7 +44,7 @@ export function operationReflect(context, selectedIDs, axis) { // don't cache this because the visible extent could change operation.disabled = function() { - if (extent.area() && extent.percentContainedIn(context.map().extent()) < 0.8) { + if (extent.percentContainedIn(context.map().extent()) < 0.8) { return 'too_large'; } else if (someMissing()) { return 'not_downloaded'; diff --git a/modules/operations/rotate.js b/modules/operations/rotate.js index 61ee33a1f..7fdf9c4c0 100644 --- a/modules/operations/rotate.js +++ b/modules/operations/rotate.js @@ -26,7 +26,7 @@ export function operationRotate(context, selectedIDs) { operation.disabled = function() { - if (extent.area() && extent.percentContainedIn(context.map().extent()) < 0.8) { + if (extent.percentContainedIn(context.map().extent()) < 0.8) { return 'too_large'; } else if (someMissing()) { return 'not_downloaded';