From 5f79e6e91cc3121c4a88bbfaea0b69995940b133 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Mon, 8 Aug 2022 15:45:32 +0200 Subject: [PATCH] [mujs] addproperty --- src/ecmascript/mujs/navigator.cpp | 31 ++++++------------------------- src/ecmascript/mujs/screen.cpp | 20 ++++---------------- src/ecmascript/mujs/unibar.cpp | 10 ++-------- 3 files changed, 12 insertions(+), 49 deletions(-) diff --git a/src/ecmascript/mujs/navigator.cpp b/src/ecmascript/mujs/navigator.cpp index 3744afea2..2711f416f 100644 --- a/src/ecmascript/mujs/navigator.cpp +++ b/src/ecmascript/mujs/navigator.cpp @@ -146,32 +146,13 @@ mjs_navigator_init(js_State *J) js_newobject(J); { addmethod(J, "navigator.toString", mjs_navigator_toString, 0); - - js_newcfunction(J, mjs_navigator_get_property_appCodeName, "navigator.appCodeName", 0); - js_pushnull(J); - js_defaccessor(J, -3, "appCodeName", JS_READONLY | JS_DONTENUM | JS_DONTCONF); - - js_newcfunction(J, mjs_navigator_get_property_appName, "navigator.appName", 0); - js_pushnull(J); - js_defaccessor(J, -3, "appName", JS_READONLY | JS_DONTENUM | JS_DONTCONF); - - js_newcfunction(J, mjs_navigator_get_property_appVersion, "navigator.appVersion", 0); - js_pushnull(J); - js_defaccessor(J, -3, "appVersion", JS_READONLY | JS_DONTENUM | JS_DONTCONF); - - js_newcfunction(J, mjs_navigator_get_property_language, "navigator.language", 0); - js_pushnull(J); - js_defaccessor(J, -3, "language", JS_READONLY | JS_DONTENUM | JS_DONTCONF); - - js_newcfunction(J, mjs_navigator_get_property_platform, "navigator.platform", 0); - js_pushnull(J); - js_defaccessor(J, -3, "platform", JS_READONLY | JS_DONTENUM | JS_DONTCONF); - - js_newcfunction(J, mjs_navigator_get_property_userAgent, "navigator.userAgent", 0); - js_pushnull(J); - js_defaccessor(J, -3, "userAgent", JS_READONLY | JS_DONTENUM | JS_DONTCONF); + addproperty(J, "navigator.appCodeName", mjs_navigator_get_property_appCodeName, NULL); + addproperty(J, "navigator.appName", mjs_navigator_get_property_appName, NULL); + addproperty(J, "navigator.appVersion", mjs_navigator_get_property_appVersion, NULL); + addproperty(J, "navigator.language", mjs_navigator_get_property_language, NULL); + addproperty(J, "navigator.platform", mjs_navigator_get_property_platform, NULL); + addproperty(J, "navigator.userAgent", mjs_navigator_get_property_userAgent, NULL); } - js_defglobal(J, "navigator", JS_DONTENUM); return 0; diff --git a/src/ecmascript/mujs/screen.cpp b/src/ecmascript/mujs/screen.cpp index b7ba15c57..41ffb4373 100644 --- a/src/ecmascript/mujs/screen.cpp +++ b/src/ecmascript/mujs/screen.cpp @@ -150,22 +150,10 @@ mjs_screen_init(js_State *J) js_newobject(J); { addmethod(J, "screen.toString", mjs_screen_toString, 0); - - js_newcfunction(J, mjs_screen_get_property_availHeight, "screen.availHeight", 0); - js_pushnull(J); - js_defaccessor(J, -3, "availHeight", JS_READONLY | JS_DONTENUM | JS_DONTCONF); - - js_newcfunction(J, mjs_screen_get_property_availWidth, "screen.availWidth", 0); - js_pushnull(J); - js_defaccessor(J, -3, "availWidth", JS_READONLY | JS_DONTENUM | JS_DONTCONF); - - js_newcfunction(J, mjs_screen_get_property_height, "screen.height", 0); - js_pushnull(J); - js_defaccessor(J, -3, "height", JS_READONLY | JS_DONTENUM | JS_DONTCONF); - - js_newcfunction(J, mjs_screen_get_property_width, "screen.width", 0); - js_pushnull(J); - js_defaccessor(J, -3, "width", JS_READONLY | JS_DONTENUM | JS_DONTCONF); + addproperty(J, "screen.availHeight", mjs_screen_get_property_availHeight, NULL); + addproperty(J, "screen.availWidth", mjs_screen_get_property_availWidth, NULL); + addproperty(J, "screen.height", mjs_screen_get_property_height, NULL); + addproperty(J, "screen.width", mjs_screen_get_property_width, NULL); } js_defglobal(J, "screen", JS_DONTENUM); diff --git a/src/ecmascript/mujs/unibar.cpp b/src/ecmascript/mujs/unibar.cpp index ffaee8cc5..d305f9605 100644 --- a/src/ecmascript/mujs/unibar.cpp +++ b/src/ecmascript/mujs/unibar.cpp @@ -152,10 +152,7 @@ mjs_menubar_init(js_State *J) js_newobject(J); { addmethod(J, "menubar.toString", mjs_menubar_toString, 0); - - js_newcfunction(J, mjs_menubar_get_property_visible, "menubar.visible", 0); - js_newcfunction(J, mjs_menubar_set_property_visible, "menubar.visible", 1); - js_defaccessor(J, -3, "visible", JS_DONTENUM | JS_DONTCONF); + addproperty(J, "menubar.visible", mjs_menubar_get_property_visible, mjs_menubar_set_property_visible); } js_defglobal(J, "menubar", JS_DONTENUM); } @@ -166,10 +163,7 @@ mjs_statusbar_init(js_State *J) js_newobject(J); { addmethod(J, "statusbar.toString", mjs_statusbar_toString, 0); - - js_newcfunction(J, mjs_statusbar_get_property_visible, "statusbar.visible", 0); - js_newcfunction(J, mjs_statusbar_set_property_visible, "statusbar.visible", 1); - js_defaccessor(J, -3, "visible", JS_DONTENUM | JS_DONTCONF); + addproperty(J, "statusbar.visible", mjs_statusbar_get_property_visible, mjs_statusbar_set_property_visible); } js_defglobal(J, "statusbar", JS_DONTENUM); }