Repository navigation
[5.6] Backport. limit wait time for baselayer (#14047) - #14305
Closed
thomasneirynck wants to merge 2 commits into
Closed
thomasneirynck wants to merge 2 commits into
thomasneirynck wants to merge 2 commits into
Conversation
kobelb
requested changes
Oct 11, 2017
| this._doRenderCompleteWhenBaseLayerIsLoaded(resolve, Date.now() + msAllowedForBaseLayerToLoad); | ||
| } | ||
|
|
||
|
|
Contributor
There was a problem hiding this comment.
Is there a reason we have all this whitespace here?
| if (this._paramsDirty || this._dataDirty || this._baseLayerDirty) { | ||
| return; | ||
| if (Date.now() <= endTime) { | ||
| setTimeout(() => { |
Contributor
There was a problem hiding this comment.
It seems like we could be using (endTime - Date.now()) to only do one setTimeout that fires the renderComplete if we haven't yet. I'm not understanding why we continually call _doRenderCompleteWhenBaseLayerIsLoaded every 10 ms recursively...
Contributor
Author
|
just to give an update. this isn't working. needs to be fixed before we can merge this into 5.6. cc @bhavyarm. I'll try and do this tomorrow, thx. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This is a manual backport of #14047.
Due to changes from v5 to v6, the implementation is slightly different.