Merge pull request #19 from vbaranov/master

.change function fix
This commit is contained in:
Victor 2017-10-11 19:58:22 +03:00 committed by GitHub
commit 854b17e410
3 changed files with 5 additions and 5 deletions

File diff suppressed because one or more lines are too long

View File

@ -44,7 +44,7 @@ function startDapp(web3, isOraclesNetwork) {
} }
function initialKeySourceOnChange(ev) { function initialKeySourceOnChange(ev) {
initialKeyChosen(this, ev.data.contractAddress, function(address) { initialKeyChosen(this, ev.data.contractAddress, ev.data.abi, function(address) {
generateAddresses(keys, function(_keys) { generateAddresses(keys, function(_keys) {
fillContractData(ev.data.contractAddress, ev.data.abi, _keys, address, function(err, address) { fillContractData(ev.data.contractAddress, ev.data.abi, _keys, address, function(err, address) {
transferCoinsToPayoutKey(err, address, _keys); transferCoinsToPayoutKey(err, address, _keys);
@ -54,11 +54,11 @@ function startDapp(web3, isOraclesNetwork) {
}; };
//triggers, if initial key is chosen //triggers, if initial key is chosen
function initialKeyChosen(el, contractAddress, cb) { function initialKeyChosen(el, contractAddress, abi, cb) {
var file = $(el).prop('files')[0]; var file = $(el).prop('files')[0];
$(el).remove(); $(el).remove();
var newEl = "<input type='file' id='initialKeySource' />"; var newEl = "<input type='file' id='initialKeySource' />";
$(newEl).change({contractAddress: contractAddress}, initialKeySourceOnChange).appendTo($(".create-keys")); $(newEl).change({contractAddress: contractAddress, abi:abi}, initialKeySourceOnChange).appendTo($(".create-keys"));
var reader = new FileReader(); var reader = new FileReader();
reader.readAsText(file, "UTF-8"); reader.readAsText(file, "UTF-8");
reader.onload = function (evt) { reader.onload = function (evt) {

View File

@ -79,7 +79,7 @@
</div> </div>
</footer> </footer>
<script src="./assets/javascripts/sweetalert2.min.js" type="text/javascript"></script> <script src="./assets/javascripts/sweetalert2.min.js" type="text/javascript"></script>
<script src="./assets/javascripts/application.js?v=1.37" type="text/javascript"></script> <script src="./assets/javascripts/application.js?v=1.38" type="text/javascript"></script>
<script src="./assets/javascripts/keythereum.min.js" type="text/javascript"></script> <script src="./assets/javascripts/keythereum.min.js" type="text/javascript"></script>
<script src="./assets/javascripts/toastr.min.js" type="text/javascript"></script> <script src="./assets/javascripts/toastr.min.js" type="text/javascript"></script>
</body> </body>