From 09a1dd43c6769fc31c728a94ca425cc3747c5f98 Mon Sep 17 00:00:00 2001 From: mike-000 <49240900+mike-000@users.noreply.github.com> Date: Mon, 28 Sep 2020 14:05:23 +0100 Subject: [PATCH] reset to collapsible when no uncollapsible sources --- src/ol/control/Attribution.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/control/Attribution.js b/src/ol/control/Attribution.js index 12eb3c570d..733f5c2a46 100644 --- a/src/ol/control/Attribution.js +++ b/src/ol/control/Attribution.js @@ -175,6 +175,7 @@ class Attribution extends Control { */ const visibleAttributions = []; + let collapsible = true; const layerStatesArray = frameState.layerStatesArray; for (let i = 0, ii = layerStatesArray.length; i < ii; ++i) { const layerState = layerStatesArray[i]; @@ -197,12 +198,8 @@ class Attribution extends Control { continue; } - if ( - !this.overrideCollapsible_ && - source.getAttributionsCollapsible() === false - ) { - this.setCollapsible(false); - } + collapsible = + collapsible && source.getAttributionsCollapsible() !== false; if (Array.isArray(attributions)) { for (let j = 0, jj = attributions.length; j < jj; ++j) { @@ -218,6 +215,9 @@ class Attribution extends Control { } } } + if (!this.overrideCollapsible_) { + this.setCollapsible(collapsible); + } return visibleAttributions; }