diff --git a/main.cpp b/main.cpp index c732951..5f6720c 100644 --- a/main.cpp +++ b/main.cpp @@ -551,22 +551,12 @@ main(int ac, const char* av[]) CROW_ROUTE(app, "/js/all_in_one.js") ([&](const crow::request& req) { - - string all_in_one = xmrblocks.get_js_file("jquery.min.js") + - xmrblocks.get_js_file("crc32.js") + - xmrblocks.get_js_file("biginteger.js") + - xmrblocks.get_js_file("config.js") + - xmrblocks.get_js_file("nacl-fast-cn.js") + - xmrblocks.get_js_file("crypto.js") + - xmrblocks.get_js_file("base58.js") + - xmrblocks.get_js_file("cn_util.js") + - xmrblocks.get_js_file("sha3.js"); - - return all_in_one; + // /js/all_in_one.js file does not exist. it is generated on the fly + // from the above real files. + return xmrblocks.get_js_file("all_in_one.js"); }); - } - + } // if (enable_js) if (enable_json_api) { @@ -738,7 +728,7 @@ main(int ac, const char* av[]) return r; }); - } + } // if (enable_json_api) if (enable_autorefresh_option) { diff --git a/src/page.h b/src/page.h index bcba26b..534224e 100644 --- a/src/page.h +++ b/src/page.h @@ -393,16 +393,25 @@ namespace xmreg if (enable_js) { // JavaScript files - template_file["jquery.min.js"] = xmreg::read(JS_JQUERY); - template_file["crc32.js"] = xmreg::read(JS_CRC32); - template_file["crypto.js"] = xmreg::read(JS_CRYPTO); - template_file["cn_util.js"] = xmreg::read(JS_CNUTIL); - template_file["base58.js"] = xmreg::read(JS_BASE58); + template_file["jquery.min.js"] = xmreg::read(JS_JQUERY); + template_file["crc32.js"] = xmreg::read(JS_CRC32); + template_file["crypto.js"] = xmreg::read(JS_CRYPTO); + template_file["cn_util.js"] = xmreg::read(JS_CNUTIL); + template_file["base58.js"] = xmreg::read(JS_BASE58); template_file["nacl-fast-cn.js"] = xmreg::read(JS_NACLFAST); - template_file["sha3.js"] = xmreg::read(JS_SHA3); - template_file["config.js"] = xmreg::read(JS_CONFIG); - template_file["biginteger.js"] = xmreg::read(JS_BIGINT); - + template_file["sha3.js"] = xmreg::read(JS_SHA3); + template_file["config.js"] = xmreg::read(JS_CONFIG); + template_file["biginteger.js"] = xmreg::read(JS_BIGINT); + + template_file["all_in_one.js"] = template_file["jquery.min.js"] + + template_file["crc32.js"] + + template_file["biginteger.js"] + + template_file["config.js"] + + template_file["nacl-fast-cn.js"] + + template_file["crypto.js"] + + template_file["base58.js"] + + template_file["cn_util.js"] + + template_file["sha3.js"]; // need to set "testnet: false," flag to reflect // if we are running testnet or mainnet explorer @@ -425,6 +434,8 @@ namespace xmreg js_html_files += ""; js_html_files += ""; + // /js/all_in_one.js file does not exist. it is generated on the fly + // from the above real files. js_html_files_all_in_one = ""; }