This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Cater for home.parity hostname in dappsUrl #3341
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
jacogr
added
A3-inprogress ⏳
jacogr
added
A0-pleasereview 🤓
|
@tomusdrw Can you please take a look. |
tomusdrw
reviewed
Nov 10, 2016
| @@ -26,6 +26,7 @@ export default class SecureApi extends Api { | |||
| this._connectState = sysuiToken === 'initial' ? 1 : 0; | |||
| this._needsToken = false; | |||
| this._dappsPort = 8080; | |||
| this._dappsInterface = null; | |||
There was a problem hiding this comment.
Could default to window.location.hostname the additional condition in if below would be not needed.
There was a problem hiding this comment.
Agreed. Had it that way around as a first stab. Just wanted to have additional protection against the case if we ever get null back for whatever reason. (Which would point to more serious issues, but ...)
tomusdrw
reviewed
Nov 10, 2016
gavofyork
added
A8-looksgood 🦄
|
Merged in master for test failures. |
jacogr
added
A0-pleasereview 🤓
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Closes https://github.com/ethcore/parity/issues/3337