From 790f90c11dedfb75c3eab300b6ab73e103a6e9a1 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 5 Jun 2020 13:12:51 -0400 Subject: [PATCH] Show "not visible" disabled reason over "connected to hidden" in the extract operation when both are applicable, in accordance with other operations --- modules/operations/extract.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/operations/extract.js b/modules/operations/extract.js index f7593472c..8834853c5 100644 --- a/modules/operations/extract.js +++ b/modules/operations/extract.js @@ -57,12 +57,12 @@ export function operationExtract(context, selectedIDs) { operation.disabled = function () { - if (selectedIDs.some(function(entityID) { + if (_extent && _extent.area() && _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); })) { return 'connected_to_hidden'; - } else if (_extent && _extent.area() && _extent.percentContainedIn(context.map().extent()) < 0.8) { - return 'too_large'; } return false;