Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-23 04:16:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also process the last variable in HTMLTemplate::process_template_expression().

Browse Source
This commit is contained in:
Relintai 2024-02-26 13:22:54 +01:00
parent dcd00dec81
commit 72c764f74c
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/web/html/html_template.cpp
View File

@ -336,7 +336,7 @@ method_name_search_done:
if (in_string) { if (in_string) {
break; break;
} }
// last_variable_end_index = v // last_variable_end_index = v
// i = ^ // i = ^
// v // v
@ -347,11 +347,11 @@ method_name_search_done:
variables.push_back(current_variable_str); variables.push_back(current_variable_str);
// next var: // next var:
// last_variable_end_index = i + 1 means: // last_variable_end_index = i + 1 means:
// var1, var2, var3 // var1, var2, var3
// ^ // ^
last_variable_end_index = i + 1; last_variable_end_index = i + 1;
} break; } break;
case '"': { case '"': {
@ -393,13 +393,20 @@ method_name_search_done:
++i; ++i;
} }
// Also add the last entry
String current_variable_str = variables_str.substr_index(last_variable_end_index, variables_str_length).strip_edges();
if (!current_variable_str.empty()) {
variables.push_back(current_variable_str);
}
String ret; String ret;
// Finally let's just process the variables themselves, and generate the final output // Finally let's just process the variables themselves, and generate the final output
for (uint32_t vi = 0; vi < variables.size(); ++vi) { for (uint32_t vi = 0; vi < variables.size(); ++vi) {
String variable = variables[vi]; String variable = variables[vi];
ret += process_template_expression_variable(variable, call_method, p_data); ret += process_template_expression_variable(variable, call_method, p_data);
} }
@ -906,11 +913,11 @@ void HTMLTemplate::_bind_methods() {
// Use // Use
ClassDB::bind_method(D_METHOD("get_template_text", "name"), &HTMLTemplate::get_template_text); ClassDB::bind_method(D_METHOD("get_template_text", "name"), &HTMLTemplate::get_template_text);
ClassDB::bind_method(D_METHOD("process_template_expression_variable", "variable", "method", "data"), &HTMLTemplate::process_template_expression_variable); ClassDB::bind_method(D_METHOD("process_template_expression_variable", "variable", "method", "data"), &HTMLTemplate::process_template_expression_variable);
ClassDB::bind_method(D_METHOD("process_template_expression", "expression", "data"), &HTMLTemplate::process_template_expression); ClassDB::bind_method(D_METHOD("process_template_expression", "expression", "data"), &HTMLTemplate::process_template_expression);
ClassDB::bind_method(D_METHOD("render_template", "text", "data"), &HTMLTemplate::render_template); ClassDB::bind_method(D_METHOD("render_template", "text", "data"), &HTMLTemplate::render_template);
ClassDB::bind_method(D_METHOD("get_and_render_template", "name", "data"), &HTMLTemplate::get_and_render_template); ClassDB::bind_method(D_METHOD("get_and_render_template", "name", "data"), &HTMLTemplate::get_and_render_template);
BIND_VMETHOD(MethodInfo(Variant::STRING, "_render", BIND_VMETHOD(MethodInfo(Variant::STRING, "_render",
@ -919,7 +926,7 @@ void HTMLTemplate::_bind_methods() {
ClassDB::bind_method(D_METHOD("render", "request", "data"), &HTMLTemplate::render); ClassDB::bind_method(D_METHOD("render", "request", "data"), &HTMLTemplate::render);
ClassDB::bind_method(D_METHOD("_render", "request", "data"), &HTMLTemplate::_render); ClassDB::bind_method(D_METHOD("_render", "request", "data"), &HTMLTemplate::_render);
// Enums // Enums
BIND_ENUM_CONSTANT(TEMPLATE_EXPRESSION_METHOD_PRINT); BIND_ENUM_CONSTANT(TEMPLATE_EXPRESSION_METHOD_PRINT);
BIND_ENUM_CONSTANT(TEMPLATE_EXPRESSION_METHOD_PRINT_RAW); BIND_ENUM_CONSTANT(TEMPLATE_EXPRESSION_METHOD_PRINT_RAW);