Skip to content
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
merged 4 commits into from
Nov 10, 2016
Merged

Cater for home.parity hostname in dappsUrl #3341

merged 4 commits into from
Nov 10, 2016

Conversation

jacogr
Copy link
Contributor

@jacogr jacogr commented Nov 10, 2016

@jacogr jacogr added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. M6-ui labels Nov 10, 2016
@jacogr jacogr added A0-pleasereview 🤓 Pull request needs code review. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels Nov 10, 2016
@jacogr
Copy link
Contributor Author

jacogr commented Nov 10, 2016

@tomusdrw Can you please take a look.

@@ -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;
Copy link
Collaborator

@tomusdrw tomusdrw Nov 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could default to window.location.hostname the additional condition in if below would be not needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 ...)

Copy link
Collaborator

@tomusdrw tomusdrw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, left small suggestion.

@gavofyork gavofyork added A8-looksgood 🦄 Pull request is reviewed well. A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. and removed A0-pleasereview 🤓 Pull request needs code review. A8-looksgood 🦄 Pull request is reviewed well. A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. labels Nov 10, 2016
@jacogr
Copy link
Contributor Author

jacogr commented Nov 10, 2016

Merged in master for test failures.

@jacogr jacogr added A0-pleasereview 🤓 Pull request needs code review. and removed A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. labels Nov 10, 2016
@gavofyork gavofyork merged commit 0b176e7 into master Nov 10, 2016
@gavofyork gavofyork deleted the jg-dapps-host branch November 10, 2016 19:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-pleasereview 🤓 Pull request needs code review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants