From 13ef619f6380bf123942de6f27421f9f6ad94c68 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Mon, 13 Mar 2017 21:43:05 +0300
Subject: [PATCH] reduced nprogress bar to template
---
assets/scripts/atomicexplorer.js | 5 +----
assets/scripts/dashboard.js | 7 ++----
assets/scripts/dashboard/DashboardDEX.js | 15 +++----------
assets/scripts/dashboard/DashboardEDEX.js | 22 +++++--------------
assets/scripts/iguana_api/IguanaDEX.js | 15 +++----------
assets/scripts/iguana_api/IguanaEDEX.js | 10 ++-------
assets/scripts/kmd_wallet/KMDAddress.js | 15 +++----------
assets/scripts/kmd_wallet/KMDInit.js | 5 +----
assets/scripts/kmd_wallet/KMDTransaction.js | 10 ++-------
.../scripts/kmd_wallet/KMDTransactionInfo.js | 10 ++-------
assets/scripts/templates/nprogressBar.js | 7 ++++++
index.html | 1 +
12 files changed, 32 insertions(+), 90 deletions(-)
create mode 100644 assets/scripts/templates/nprogressBar.js
diff --git a/assets/scripts/atomicexplorer.js b/assets/scripts/atomicexplorer.js
index cc60867..fa667b1 100644
--- a/assets/scripts/atomicexplorer.js
+++ b/assets/scripts/atomicexplorer.js
@@ -17,10 +17,7 @@ var AtomicExplorer = function() {
$('#atomic_explorer_getcoinpeers_btn').click(function() {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
console.log('button pushed in atomic explorer');
diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js
index 94b31b0..9450ccc 100644
--- a/assets/scripts/dashboard.js
+++ b/assets/scripts/dashboard.js
@@ -354,10 +354,7 @@ var Dashboard = function() {
submitHandler: function(form) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -724,7 +721,7 @@ var Dashboard = function() {
coinlogo = 'SHARK';
coinname = 'SHARK';
break;
- case 'BOTS':
+ case 'BOTS':
coinlogo = 'BOTS';
coinname = 'BOTS';
break;
diff --git a/assets/scripts/dashboard/DashboardDEX.js b/assets/scripts/dashboard/DashboardDEX.js
index c225e4f..9b14f3e 100644
--- a/assets/scripts/dashboard/DashboardDEX.js
+++ b/assets/scripts/dashboard/DashboardDEX.js
@@ -7,10 +7,7 @@ function getDEXCoinBalance(coin) {
function getDEXGetBalance(coin) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
return new Promise((resolve) => {
@@ -84,10 +81,7 @@ function getDEXGetBalance(coin) {
function getDEXGetBalance_cache(coin) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -172,10 +166,7 @@ function getDEXGetBalance_cache(coin) {
function getDEXGetBalance2(coin) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
diff --git a/assets/scripts/dashboard/DashboardEDEX.js b/assets/scripts/dashboard/DashboardEDEX.js
index 6f69624..fb4522d 100644
--- a/assets/scripts/dashboard/DashboardEDEX.js
+++ b/assets/scripts/dashboard/DashboardEDEX.js
@@ -2,10 +2,7 @@ function EdexfillTxHistory(coin) {
$('#edexcoin_txhistory').data('panel-api').load();
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -440,10 +437,7 @@ function refreshEDEXCoinWalletList() {
function EdexGetTxList(coin) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -678,10 +672,7 @@ function EdexGetTxList(coin) {
function EdexGetTxList_cache(coin) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -714,7 +705,7 @@ function EdexGetTxList_cache(coin) {
tmp_amount = '<span class="label label-dark">' + _lang[defaultLang].DASHBOARD.UNKNOWN + '</span>';
}
- var tmp_addr = null
+ var tmp_addr = null;
if (!('paid' in result_data[index])) {
tmp_addr = '<i class="icon fa-bullseye"></i> <span class="label label-dark">' + _lang[defaultLang].DASHBOARD.ZADDR_NOT_LISTED + '!</span>';
}
@@ -985,10 +976,7 @@ function clearEdexSendFieldData() {
function EdexListAllAddr(coin) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
diff --git a/assets/scripts/iguana_api/IguanaDEX.js b/assets/scripts/iguana_api/IguanaDEX.js
index 67feccd..cf55cb0 100644
--- a/assets/scripts/iguana_api/IguanaDEX.js
+++ b/assets/scripts/iguana_api/IguanaDEX.js
@@ -405,10 +405,7 @@ function Iguana_DEXsendrawtx(data) {
function EDEX_DEXlistunspent(coin, addr) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -448,10 +445,7 @@ function EDEX_DEXlistunspent(coin, addr) {
function EDEX_DEXnotarychains() {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -490,10 +484,7 @@ function EDEX_DEXnotarychains() {
function EDEX_DEXgetinfoAll() {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
diff --git a/assets/scripts/iguana_api/IguanaEDEX.js b/assets/scripts/iguana_api/IguanaEDEX.js
index 749f21b..ed18c5b 100644
--- a/assets/scripts/iguana_api/IguanaEDEX.js
+++ b/assets/scripts/iguana_api/IguanaEDEX.js
@@ -1,10 +1,7 @@
function EDEXlistunspent(coin, addr) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -133,10 +130,7 @@ function clearEdexSendFieldData() {
function EDEXMainAddr(coin) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
diff --git a/assets/scripts/kmd_wallet/KMDAddress.js b/assets/scripts/kmd_wallet/KMDAddress.js
index a45e93d..49935df 100644
--- a/assets/scripts/kmd_wallet/KMDAddress.js
+++ b/assets/scripts/kmd_wallet/KMDAddress.js
@@ -103,10 +103,7 @@ function KMDListaddrZ() {
function KMDListAddresses(pubpriv) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -173,10 +170,7 @@ function KMDListAddresses(pubpriv) {
function KMDGetNewAddresses(pubpriv) {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -239,10 +233,7 @@ function KMDGetNewAddresses(pubpriv) {
function KMDListAllAddr() {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
diff --git a/assets/scripts/kmd_wallet/KMDInit.js b/assets/scripts/kmd_wallet/KMDInit.js
index aca9099..7ef25d6 100644
--- a/assets/scripts/kmd_wallet/KMDInit.js
+++ b/assets/scripts/kmd_wallet/KMDInit.js
@@ -11,10 +11,7 @@ function checkTimestamp(dateToCheck) {
function RunKMDInitFunctions() {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
diff --git a/assets/scripts/kmd_wallet/KMDTransaction.js b/assets/scripts/kmd_wallet/KMDTransaction.js
index 5751f12..181ea26 100644
--- a/assets/scripts/kmd_wallet/KMDTransaction.js
+++ b/assets/scripts/kmd_wallet/KMDTransaction.js
@@ -1,10 +1,7 @@
function KMDGetPublicTransactions() {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -94,10 +91,7 @@ function KMDGetPublicTransactions() {
function KMDGetProtectedTransactions() {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
diff --git a/assets/scripts/kmd_wallet/KMDTransactionInfo.js b/assets/scripts/kmd_wallet/KMDTransactionInfo.js
index 8b43b0c..7620149 100644
--- a/assets/scripts/kmd_wallet/KMDTransactionInfo.js
+++ b/assets/scripts/kmd_wallet/KMDTransactionInfo.js
@@ -1,10 +1,7 @@
function KMDlistunspentT() {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
@@ -179,10 +176,7 @@ function KMDGetOPIDInfo(opid) {
function KMDListAllOPIDs() {
NProgress.done(true);
NProgress.configure({
- template: '<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>' +
- '<div class="spinner" role="spinner">' +
- '<div class="spinner-icon"></div>' +
- '</div>'
+ template: templates.nprogressBar
});
NProgress.start();
diff --git a/assets/scripts/templates/nprogressBar.js b/assets/scripts/templates/nprogressBar.js
new file mode 100644
index 0000000..65b53fa
--- /dev/null
+++ b/assets/scripts/templates/nprogressBar.js
@@ -0,0 +1,7 @@
+templates.nprogressBar =
+`
+<div class="bar nprogress-bar-header nprogress-bar-info" role="bar"></div>
+<div class="spinner" role="spinner">
+ <div class="spinner-icon"></div>
+</div>
+`;
\ No newline at end of file
diff --git a/index.html b/index.html
index c565ea4..c8dac29 100755
--- a/index.html
+++ b/index.html
@@ -72,6 +72,7 @@
const templates = {};
</script>
<script src="assets/scripts/templates/addCoinOptions.js"></script>
+ <script src="assets/scripts/templates/nprogressBar.js"></script>
<script src="assets/scripts/templates/refreshBasiliskConnectionsModal.js"></script>
<script src="assets/scripts/templates/addCoinModal.js"></script>
<script src="assets/scripts/templates/ieFix.js"></script>