diff --git a/applications/system/js_app/examples/apps/Scripts/Examples/stringutils.js b/applications/system/js_app/examples/apps/Scripts/Examples/stringutils.js index 76a16653e..c1f4d447a 100644 --- a/applications/system/js_app/examples/apps/Scripts/Examples/stringutils.js +++ b/applications/system/js_app/examples/apps/Scripts/Examples/stringutils.js @@ -12,8 +12,8 @@ let searchStr = "World"; let result2 = toString(sampleText.indexOf(searchStr)); print(result2); -let upperCaseText = "Text in upper case: " + to_upper_case(sampleText); +let upperCaseText = "Text in upper case: " + toUpperCase(sampleText); print(upperCaseText); -let lowerCaseText = "Text in lower case: " + to_lower_case(sampleText); +let lowerCaseText = "Text in lower case: " + toLowerCase(sampleText); print(lowerCaseText); diff --git a/applications/system/js_app/examples/apps/Scripts/interactive.js b/applications/system/js_app/examples/apps/Scripts/interactive.js index 95db91153..d346552e2 100644 --- a/applications/system/js_app/examples/apps/Scripts/interactive.js +++ b/applications/system/js_app/examples/apps/Scripts/interactive.js @@ -12,14 +12,14 @@ while (dialog.message("Interactive Console", result)) { let input = keyboard.text(256); if (!input) break; - let path = tmp_template + to_string(tmp_number++); + let path = tmp_template + toString(tmp_number++); storage.write(path, "({run:function(){return " + input + ";},})"); result = load(path).run(); storage.remove(path); // Must convert to string explicitly if (typeof result === "number") { - result = to_string(result); + result = toString(result); } else if (typeof result === "undefined") { result = "undefined"; } else if (typeof result === "boolean") { diff --git a/applications/system/js_app/js_thread.c b/applications/system/js_app/js_thread.c index 95cad84f6..c448945de 100644 --- a/applications/system/js_app/js_thread.c +++ b/applications/system/js_app/js_thread.c @@ -337,9 +337,9 @@ static int32_t js_thread(void* arg) { mjs_set(mjs, global, "toString", ~0, MJS_MK_FN(js_global_to_string)); mjs_set(mjs, global, "ffi_address", ~0, MJS_MK_FN(js_ffi_address)); mjs_set(mjs, global, "require", ~0, MJS_MK_FN(js_require)); - mjs_set(mjs, global, "parse_int", ~0, MJS_MK_FN(js_parse_int)); - mjs_set(mjs, global, "to_upper_case", ~0, MJS_MK_FN(js_to_upper_case)); - mjs_set(mjs, global, "to_lower_case", ~0, MJS_MK_FN(js_to_lower_case)); + mjs_set(mjs, global, "parseInt", ~0, MJS_MK_FN(js_parse_int)); + mjs_set(mjs, global, "toUpperCase", ~0, MJS_MK_FN(js_to_upper_case)); + mjs_set(mjs, global, "toLowerCase", ~0, MJS_MK_FN(js_to_lower_case)); mjs_val_t console_obj = mjs_mk_object(mjs); mjs_set(mjs, console_obj, "log", ~0, MJS_MK_FN(js_console_log)); diff --git a/applications/system/js_app/modules/js_vgm/js_vgm.c b/applications/system/js_app/modules/js_vgm/js_vgm.c index 2d7a56b6e..8d48d843f 100644 --- a/applications/system/js_app/modules/js_vgm/js_vgm.c +++ b/applications/system/js_app/modules/js_vgm/js_vgm.c @@ -144,10 +144,10 @@ static void js_vgm_destroy(void* inst) { } static const JsModuleDescriptor js_vgm_desc = { - name: "vgm", - create: js_vgm_create, - destroy: js_vgm_destroy, - api_interface: NULL, + "vgm", + js_vgm_create, + js_vgm_destroy, + NULL, }; static const FlipperAppPluginDescriptor plugin_descriptor = { diff --git a/applications/system/js_app/types/badusb/index.d.ts b/applications/system/js_app/types/badusb/index.d.ts index 4b49dc991..c1fcaafbf 100644 --- a/applications/system/js_app/types/badusb/index.d.ts +++ b/applications/system/js_app/types/badusb/index.d.ts @@ -34,7 +34,7 @@ export type KeyCode = MainKey | ModifierKey | number; * @brief Initializes the module * @param settings USB device settings. Omit to select default parameters */ -export declare function setup(settings?: { vid: number, pid: number, mfrName?: string, prodName?: string, layout_path: string }): void; +export declare function setup(settings?: { vid: number, pid: number, mfrName?: string, prodName?: string, layoutPath: string }): void; /** * @brief Tells whether the virtual USB HID device has successfully connected diff --git a/documentation/js/js_builtin.md b/documentation/js/js_builtin.md index 9c59b9822..043921e27 100644 --- a/documentation/js/js_builtin.md +++ b/documentation/js/js_builtin.md @@ -40,11 +40,11 @@ print("string1", "string2", 123); ## console.debug Same as `print`, but output to serial console only, with corresponding log level. -## to_string +## toString Convert a number to string with an optional base. ### Examples: ```js -to_string(123) // "123" -to_string(123, 16) // "0x7b" +toString(123) // "123" +toString(123, 16) // "0x7b" ```