RanchiMall/exchangemarket
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from sairajzero/master

Browse Source
This commit is contained in:
Sai Raj 2020-01-05 20:53:21 +05:30 committed by GitHub
commit bbb2a4596b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
standard_Operations.html
View File

@ -7206,7 +7206,7 @@ Bitcoin.Util = {
privKey: key.getBitcoinWalletImportFormat() privKey: key.getBitcoinWalletImportFormat()
} }
} catch (e) { } catch (e) {
console.log(e); console.error(e);
} }
}, },
@ -7243,7 +7243,7 @@ Bitcoin.Util = {
else else
return false; return false;
} catch (e) { } catch (e) {
console.log(e); console.error(e);
} }
}, },
@ -8447,6 +8447,7 @@ Bitcoin.Util = {
} }
</script> </script>
<script id="floDapps"> <script id="floDapps">
/* General functions for FLO Dapps*/
const floDapps = { const floDapps = {
util:{ util:{
@ -8625,11 +8626,11 @@ Bitcoin.Util = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.startUpFunctions[fname]().then(result => { this.startUpFunctions[fname]().then(result => {
this.callStartUpFunction.completed += 1 this.callStartUpFunction.completed += 1
console.log(`${result}\nCompleted ${this.callStartUpFunction.completed}/${this.callStartUpFunction.total} Startup functions`) reactor.dispatchEvent("startUpSuccessLog",`${result}\nCompleted ${this.callStartUpFunction.completed}/${this.callStartUpFunction.total} Startup functions`)
resolve(true) resolve(true)
}).catch(error => { }).catch(error => {
this.callStartUpFunction.failed += 1 this.callStartUpFunction.failed += 1
console.error(`${error}\nFailed ${this.callStartUpFunction.failed}/${this.callStartUpFunction.total} Startup functions`) reactor.dispatchEvent("startUpErrorLog",`${error}\nFailed ${this.callStartUpFunction.failed}/${this.callStartUpFunction.total} Startup functions`)
reject(false) reject(false)
}) })
}) })
@ -8699,6 +8700,12 @@ Bitcoin.Util = {
} }
} }
reactor.registerEvent("startUpSuccessLog");
reactor.addEventListener("startUpSuccessLog", log => console.log(log))
reactor.registerEvent("startUpErrorLog");
reactor.addEventListener("startUpErrorLog", log => console.error(log))
function onLoadStartUp() { function onLoadStartUp() {
//addStartUpFunction('Sample', Promised Function) //addStartUpFunction('Sample', Promised Function)