status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use standard Web3 HttpProvider for http & fix jQuery conflict

This commit is contained in:
Roman Volosovskyi 2017-02-21 16:44:49 +02:00
parent 7e129a9f26
commit 89eb890d94
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/jquery-3.1.1.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
resources/web3_init.js
View File

@ -104,4 +104,8 @@ StatusHttpProvider.prototype.isConnected = function () {
}
};
web3 = new Web3(new StatusHttpProvider("http://localhost:8545"));
if (window.location.protocol == "https:") {
web3 = new Web3(new StatusHttpProvider("http://localhost:8545"));
} else {
web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:8545"));
}