aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

[mujs] More js_try

Browse Source
This commit is contained in:
Witold Filipczyk 2022-08-20 14:26:00 +02:00
parent f9d5ec099b
commit abbfdc3db1
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ecmascript/mujs/attributes.cpp
View File

@ -86,11 +86,13 @@ mjs_attributes_set_items(js_State *J, void *node)
js_setindex(J, -2, i); js_setindex(J, -2, i);
xmlpp::ustring name = attr->get_name(); xmlpp::ustring name = attr->get_name();
if (js_try(J)) {
if (name != "" && name != "item" && name != "namedItem") { js_pop(J, 1);
mjs_push_attr(J, attr); continue;
js_setproperty(J, -2, name.c_str());
} }
mjs_push_attr(J, attr);
js_setproperty(J, -2, name.c_str());
js_endtry(J);
} }
} }

10
src/ecmascript/mujs/collection.cpp
View File

@ -190,10 +190,14 @@ mjs_htmlCollection_set_items(js_State *J, void *node)
if (name == "") { if (name == "") {
name = element->get_attribute_value("name"); name = element->get_attribute_value("name");
} }
if (name != "" && name != "item" && name != "namedItem") { if (js_try(J)) {
mjs_push_element(J, element); js_pop(J, 1);
js_setproperty(J, -2, name.c_str()); goto next;
} }
mjs_push_element(J, element);
js_setproperty(J, -2, name.c_str());
js_endtry(J);
next:
counter++; counter++;
} }
} }

15
src/ecmascript/mujs/form.cpp
View File

@ -128,13 +128,24 @@ mjs_form_set_items(js_State *J, void *node)
mjs_push_form_control_object(J, fc->type, fs); mjs_push_form_control_object(J, fc->type, fs);
js_setindex(J, -2, counter); js_setindex(J, -2, counter);
if (fc->id && strcmp(fc->id, "item") && strcmp(fc->id, "namedItem")) { if (fc->id) {
if (js_try(J)) {
js_pop(J, 1);
goto next;
}
mjs_push_form_control_object(J, fc->type, fs); mjs_push_form_control_object(J, fc->type, fs);
js_setproperty(J, -2, fc->id); js_setproperty(J, -2, fc->id);
} else if (fc->name && strcmp(fc->name, "item") && strcmp(fc->name, "namedItem")) { js_endtry(J);
} else if (fc->name) {
if (js_try(J)) {
js_pop(J, 1);
goto next;
}
mjs_push_form_control_object(J, fc->type, fs); mjs_push_form_control_object(J, fc->type, fs);
js_setproperty(J, -2, fc->name); js_setproperty(J, -2, fc->name);
js_endtry(J);
} }
next:
counter++; counter++;
} }
} }

8
src/ecmascript/mujs/forms.cpp
View File

@ -101,10 +101,16 @@ mjs_forms_set_items(js_State *J)
mjs_push_form_object(J, form); mjs_push_form_object(J, form);
js_setindex(J, -2, counter); js_setindex(J, -2, counter);
if (form->name && strcmp(form->name, "item") && strcmp(form->name, "namedItem")) { if (form->name) {
if (js_try(J)) {
js_pop(J, 1);
goto next;
}
mjs_push_form_object(J, form); mjs_push_form_object(J, form);
js_setproperty(J, -2, form->name); js_setproperty(J, -2, form->name);
js_endtry(J);
} }
next:
counter++; counter++;
} }
} }