LogoControl cleanup #4842
Merged
LogoControl cleanup #4842
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
jingsam
reviewed
Jun 16, 2017
src/ui/control/logo_control.js
Outdated
| this._logoDisplay = true; | ||
| } else if (this._logoDisplay && !this._logoRequired()) { | ||
| this._container.style.display = 'none'; | ||
| this._logoDisplay = false; |
There was a problem hiding this comment.
We could simply toggle display like this:
this._container.style.display = this._logoRequired() ? 'block' : 'none'
The state variable this._logoDisplay seems unnecessary.
jfirebaugh
reviewed
Jun 16, 2017
src/ui/control/logo_control.js
Outdated
|
|
||
| this._map.on('sourcedata', this._updateLogo); | ||
| this._updateLogo(); |
There was a problem hiding this comment.
I think updating on add was a good idea. Instead of removing it, how about changing the condition in _updateLogo to !e || e.sourceDataType === 'metadata')?
There was a problem hiding this comment.
Sure! I actually had that for a second, but after I moved the DOM.create stuff to onAdd I didn't think it was necessary anymore. But there is a potential race condition if source fires its metadata event before the LogoControl is added 👍
jfirebaugh
force-pushed
the
logocontrol-cleanup
branch
from
8d5fcaf to
8818af3
Compare
jfirebaugh
approved these changes
Jul 7, 2017
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 #4813
This changes a couple things.
I added a
sourcedataevent firing when a source is removed. This seems in line with the current description in our docs:I also follow @jingsam's recommendation of hiding the LogoControl when no Mapbox sources are present instead of removing it from the DOM.
Launch Checklist