Skip to content

Commit a879e05

Browse files
bitrequestbitrequest
committed
GD update
1 parent 281d36d commit a879e05

18 files changed

+691
-358
lines changed

‎assets_js_bitrequest_bip39.js

+57-13
Original file line numberDiff line numberDiff line change
@@ -473,20 +473,64 @@ function manage_bip32(dat) {
473473
return
474474
}
475475
var data = (dat) ? dat : {},
476-
content = $("<div class='formbox' id='disclaimer_dialog'>\
477-
<h2><span class='icon-warning' style='color:#B33A3A'></span>Disclaimer!</h2>\
478-
<div class='popnotify'></div>\
479-
<form class='popform'>\
480-
<div class='inputwrap'><p>Funds received by addresses generated from your secret phrase can not be spend by Bitrequest.<br/>To spend your funds you wil need to restore your secret phrase in a <a href='https://www.bitrequest.io/compatible-wallets' target='_blank' class='ref'>compatible wallet.</a></p></div>\
481-
<div id='pk_confirm' class='noselect'><div id='pk_confirmwrap' class='cb_wrap' data-checked='false'><span class='checkbox'></span></div><span>I understand and am ok with this.</span></div>\
482-
<input type='submit' class='submit' value='OK'></form></div>").data(data);
476+
ddat = [{
477+
"div": {
478+
"class": "popform",
479+
"content": [{
480+
"div": {
481+
"class": "inputwrap",
482+
"content": "<p>Funds received by addresses generated from your secret phrase can not be spend by Bitrequest.<br/>To spend your funds you wil need to restore your secret phrase in a <a href='https://www.bitrequest.io/compatible-wallets' target='_blank' class='ref'>compatible wallet.</a></p>"
483+
},
484+
}]
485+
}
486+
},
487+
{
488+
"div": {
489+
"id": "pk_confirm",
490+
"class": "noselect",
491+
"content": [{
492+
"div": {
493+
"id": "pk_confirmwrap",
494+
"class": "cb_wrap",
495+
"attr": {
496+
"data-checked": "false"
497+
},
498+
"content": [{
499+
"span": {
500+
"class": "checkbox"
501+
}
502+
}]
503+
},
504+
"span": {
505+
"content": "I understand and am ok with this."
506+
}
507+
508+
}]
509+
}
510+
},
511+
{
512+
"input": {
513+
"class": "submit",
514+
"attr": {
515+
"type": "submit",
516+
"value": "ok"
517+
}
518+
}
519+
}
520+
],
521+
content = $(template_dialog({
522+
"id": "disclaimer_dialog",
523+
"icon": "icon-warning",
524+
"title": "Disclaimer!",
525+
"elements": ddat
526+
})).data(data);
483527
if ($("#option_makeseed").length) {
484528
canceldialog();
485529
setTimeout(function() {
486-
popdialog(content, "alert", "triggersubmit");
530+
popdialog(content, "triggersubmit");
487531
}, 1000);
488532
} else {
489-
popdialog(content, "alert", "triggersubmit");
533+
popdialog(content, "triggersubmit");
490534
}
491535
}
492536

@@ -849,7 +893,7 @@ function continue_seed() {
849893
function skip_verify() {
850894
$(document).on("click", "#cfbu3", function() {
851895
var content = "<h2><span class='icon-warning' style='color:#B33A3A'></span>Warning! Continue at your own risk.</h2><p><strong>If you lose your device, uninstall your application or clear your browserdata, you'll need your secret phrase to recover your funds!</strong></p>";
852-
popdialog(content, "alert", "finish_seed");
896+
popdialog(content, "finish_seed");
853897
})
854898
}
855899

@@ -1221,7 +1265,7 @@ function show_phrase_callback() {
12211265
function delete_phrase_trigger() {
12221266
$(document).on("click", "#deletephrase", function() {
12231267
var content = "<h2 style='color:#B33A3A'><span class='icon-warning'></span>Warning! Deleting your seed may result in lost of funds.</h2><p><strong>Continue only if you have a backup of your secret phrase.</strong></p>";
1224-
popdialog(content, "alert", "delete_phrase_verify");
1268+
popdialog(content, "delete_phrase_verify");
12251269
});
12261270
}
12271271

@@ -1615,7 +1659,7 @@ function phrase_info_pu(coin) {
16151659
</li>" + del_phr_str +
16161660
"</ul>\
16171661
</div>").data(root_dat);
1618-
popdialog(content, "alert", "canceldialog");
1662+
popdialog(content, "canceldialog");
16191663
$.each(br_config.bitrequest_coin_data, function(i, coinconfig) {
16201664
var currency = coinconfig.currency,
16211665
ccsymbol = coinconfig.data.ccsymbol,
@@ -1719,7 +1763,7 @@ function compatible_wallets(coin) {
17191763
</li>\
17201764
</ul>\
17211765
</div>");
1722-
popdialog(content, "alert", "canceldialog");
1766+
popdialog(content, "canceldialog");
17231767
$.each(br_config.bitrequest_coin_data, function(i, coinconfig) {
17241768
var currency = coinconfig.currency,
17251769
ccsymbol = coinconfig.data.ccsymbol,

‎assets_js_bitrequest_coin_settings.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function edit_confirmations() {
111111
"title": "Confirmations",
112112
"elements": ddat
113113
});
114-
popdialog(content, "alert", "triggersubmit");
114+
popdialog(content, "triggersubmit");
115115
var currentli = $("#conf_formbox ul.conf_options li").filter(function() {
116116
return $(this).find("span").text() == confsrc;
117117
});
@@ -232,7 +232,7 @@ function edit_blockexplorer() {
232232
"title": "Choose Blockexplorer",
233233
"elements": ddat
234234
});
235-
popdialog(content, "alert", "triggersubmit");
235+
popdialog(content, "triggersubmit");
236236
var optionlist = $("#be_formbox").find(".options");
237237
$.each(options, function(i, value) {
238238
optionlist.append("<span data-pe='none'>" + value + "</span>");
@@ -302,7 +302,7 @@ function edit_rpcnode() {
302302
"<input type='submit' class='submit' value='OK' data-currency='" + thiscurrency + "'/>\
303303
</div>\
304304
</div>";
305-
popdialog(content, "alert", "triggersubmit");
305+
popdialog(content, "triggersubmit");
306306
var optionlist = $("#settingsbox").find(".options");
307307
$.each(api_list, function(key, value) {
308308
if (value.display === true) {
@@ -758,7 +758,7 @@ function edit_xpub_trigger() {
758758
<div id='backupcd'>CANCEL</div>\
759759
</div>\
760760
</div>");
761-
popdialog(content, "alert", "triggersubmit", null, true);
761+
popdialog(content, "triggersubmit", null, true);
762762
return
763763
}
764764
}
@@ -866,7 +866,7 @@ function edit_xpub(ad) {
866866
</div>\
867867
</div>\
868868
<input type='submit' class='submit' value='OK'></form>").data(ad);
869-
popdialog(content, "alert", "triggersubmit");
869+
popdialog(content, "triggersubmit");
870870
if (supportsTouch === true) {} else {
871871
$("#popup input.address").focus();
872872
}
@@ -1157,7 +1157,7 @@ function xpub_info_pu(currency, xpub) {
11571157
</li>\
11581158
</ul>\
11591159
</div>").data(root_dat);
1160-
popdialog(content, "alert", "triggersubmit");
1160+
popdialog(content, "triggersubmit");
11611161
var dp_node_dat = {
11621162
"bip32": bip32dat,
11631163
"currency": currency
@@ -1200,7 +1200,7 @@ function add_apikey(api) {
12001200
"</div>";
12011201
canceldialog();
12021202
setTimeout(function() {
1203-
popdialog(content, "alert", "triggersubmit");
1203+
popdialog(content, "triggersubmit");
12041204
}, 800);
12051205
}
12061206

0 commit comments

Comments
 (0)