Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Open popup without attempting inline #4440

Merged
merged 2 commits into from
Feb 6, 2017
Merged

Open popup without attempting inline #4440

merged 2 commits into from
Feb 6, 2017

Conversation

tomusdrw
Copy link
Collaborator

@tomusdrw tomusdrw commented Feb 6, 2017

Opening popup outside of a frame processing user action (click event) will cause the popup to be blocked.

This fix only attempts inline installation when on the right domain.

@tomusdrw tomusdrw added A0-pleasereview 🤓 Pull request needs code review. B0-patch labels Feb 6, 2017
@jacogr jacogr added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Feb 6, 2017
@@ -68,6 +68,19 @@ export default class Store {
installExtension = () => {
this.setInstalling(true);

if (window.location.hostname === 'home.web3.site') {
Copy link
Contributor

@jacogr jacogr Feb 6, 2017

Choose a reason for hiding this comment

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

Should probably just check for <anything>.web3.site, however it is good getting around the issue until we figure out a way forward.

@jacogr jacogr added A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Feb 6, 2017
@tomusdrw tomusdrw added A0-pleasereview 🤓 Pull request needs code review. and removed A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. labels Feb 6, 2017
const BASE_URL = '.web.web3.site';
import { DOMAIN } from './constants';

const BASE_URL = `.web${DOMAIN}`;
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks.

@jacogr jacogr added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Feb 6, 2017
@jacogr jacogr merged commit 4ac91b3 into master Feb 6, 2017
@jacogr jacogr deleted the popup-block branch February 6, 2017 08:26
tomusdrw added a commit that referenced this pull request Feb 6, 2017
* Open popup without attempting inline

* Cater for all .web3.site addresses
jacogr pushed a commit that referenced this pull request Feb 6, 2017
* Open popup without attempting inline

* Cater for all .web3.site addresses
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants