grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix extension detection (#6452) (#6524)

Browse Source 
* Fix extension detection.

* Fix mobx quirks.

* Update submodule.
This commit is contained in:
Tomasz Drwięga 2017-09-15 21:08:12 +02:00 committed by Gav Wood
parent e614203170
commit cc562d2c4f
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/ui/SelectionList/selectionList.css
View File

@ -22,6 +22,7 @@
height: 100%;
position: relative;
width: 100%;
max-width: 100%;
&:hover {
filter: none;

28
js/src/views/Application/Extension/store.js
View File

@ -39,7 +39,6 @@ export default class Store {
constructor () {
this.nextDisplay = store.get(NEXT_DISPLAY) || 0;
this.testInstall();
}
@computed get showWarning () {
@ -59,20 +58,29 @@ export default class Store {
store.set(NEXT_DISPLAY, this.nextDisplay);
}
@action testInstall = () => {
this.shouldInstall = this.readStatus();
@action setShouldInstall = (status) => {
this.shouldInstall = status;
}
testInstall = () => {
this.readStatus().then(this.setShouldInstall);
}
readStatus = () => {
const hasExtension = Symbol.for('parity.extension') in window;
const ua = browser.analyze(navigator.userAgent || '');
return new Promise((resolve, reject) => {
// Defer checking for the extension since it may not have loaded yet.
setTimeout(() => {
const hasExtension = Symbol.for('parity.extension') in window;
const ua = browser.analyze(navigator.userAgent || '');
if (hasExtension) {
this.setExtensionActive();
return false;
}
if (hasExtension) {
this.setExtensionActive();
return resolve(false);
}
return (ua || {}).name.toLowerCase() === 'chrome';
return resolve((ua || {}).name.toLowerCase() === 'chrome');
}, 5000);
});
}
installExtension = () => {