Remove controls when the map is removed #7042
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jfirebaugh
approved these changes
Jul 28, 2018
mourner
reviewed
Jul 28, 2018
src/ui/map.js
Outdated
| const numControls = this._controls.length; | ||
| for (let i = numControls; i > 0; i--) { | ||
| this.removeControl(this._controls[i - 1]); | ||
| } |
There was a problem hiding this comment.
Alternatively, you could just call onRemove directly and not worry about indices:
for (const control of this._controls) control.onRemove(this);
mollymerp
force-pushed
the
remove-controls
branch
from
2b42661 to
b2a1ff6
Compare
jfirebaugh
reviewed
Jul 30, 2018
test/unit/ui/map.test.js
Outdated
| @@ -785,8 +785,13 @@ test('Map', (t) => { | |||
| t.test('#remove', (t) => { | |||
| const map = createMap(t); | |||
| t.equal(map.getContainer().childNodes.length, 3); | |||
| // LogoControl is added to the map in the constructor | |||
There was a problem hiding this comment.
How about something like:
t.test('#remove calls onRemove on added controls', (t) => {
const map = createMap(t);
const control = { onRemove: t.spy() };
map.addControl(control);
map.remove();
t.ok(control.onRemove.calledOnce);
});
This avoids relying on map implementation details, and tests one desired behavior in isolation from others so it's easier to understand and debug if it fails.
added 2 commits
July 30, 2018 11:48
… is removed simpler loop + new test update test
mollymerp
force-pushed
the
remove-controls
branch
from
b2a1ff6 to
e240a48
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #3264
Launch Checklist