From fab5410988b2476838692de12abcf51cf249e8bb Mon Sep 17 00:00:00 2001
From: oblomov <102328295+oblomov-dev@users.noreply.github.com>
Date: Tue, 7 Nov 2023 09:37:12 +0100
Subject: [PATCH] update xml parser - bugfixes (#630)
---
src/01/z2ui5_cl_cc_bwipjs.clas.abap | 4 +++-
src/01/z2ui5_cl_cc_file_uploader.clas.abap | 3 ++-
src/01/z2ui5_cl_cc_font_awesome_icons.clas.abap | 5 +++--
src/01/z2ui5_cl_cc_geolocation.clas.abap | 4 ++--
src/01/z2ui5_cl_cc_info.clas.abap | 4 ++--
src/01/z2ui5_cl_cc_spreadsheet.clas.abap | 4 ++--
src/01/z2ui5_cl_cc_timer.clas.abap | 4 ++--
src/z2ui5_cl_xml_view.clas.abap | 15 ++++++++++++---
8 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/01/z2ui5_cl_cc_bwipjs.clas.abap b/src/01/z2ui5_cl_cc_bwipjs.clas.abap
index 0ed97c6b..7c741e8a 100644
--- a/src/01/z2ui5_cl_cc_bwipjs.clas.abap
+++ b/src/01/z2ui5_cl_cc_bwipjs.clas.abap
@@ -216,7 +216,9 @@ CLASS z2ui5_cl_cc_bwipjs IMPLEMENTATION.
` });` && |\n| &&
` });`.
- result = mo_view->_cc_plain_xml( `` && js && `` ).
+* result = mo_view->_cc_plain_xml( `` && js && `` ).
+
+ result = mo_view->_generic( ns = `html` name = `script` )->_cc_plain_xml( js ).
ENDMETHOD.
diff --git a/src/01/z2ui5_cl_cc_file_uploader.clas.abap b/src/01/z2ui5_cl_cc_file_uploader.clas.abap
index c09a245b..9079c3cb 100644
--- a/src/01/z2ui5_cl_cc_file_uploader.clas.abap
+++ b/src/01/z2ui5_cl_cc_file_uploader.clas.abap
@@ -215,7 +215,8 @@ CLASS Z2UI5_CL_CC_FILE_UPLOADER IMPLEMENTATION.
` });` && |\n| &&
` });`.
- result = mo_view->_cc_plain_xml( `` && js && `` ).
+* result = mo_view->_cc_plain_xml( `` && js && `` ).
+ result = mo_view->_generic( ns = `html` name = `script` )->_cc_plain_xml( js ).
ENDMETHOD.
ENDCLASS.
diff --git a/src/01/z2ui5_cl_cc_font_awesome_icons.clas.abap b/src/01/z2ui5_cl_cc_font_awesome_icons.clas.abap
index 047c8aa1..5247beda 100644
--- a/src/01/z2ui5_cl_cc_font_awesome_icons.clas.abap
+++ b/src/01/z2ui5_cl_cc_font_awesome_icons.clas.abap
@@ -39,9 +39,10 @@ CLASS Z2UI5_CL_CC_FONT_AWESOME_ICONS IMPLEMENTATION.
METHOD LOAD_ANIMATION_JS.
- result = mo_view->_cc_plain_xml( `` ).
+* result = mo_view->_cc_plain_xml( `` ).
+ result = mo_view->_generic( ns = `html` name = `script` t_prop = value #( ( n = `src` v = faw_js_url ) ) ).
- ENDMETHOD.
+ enDMETHOD.
METHOD LOAD_ICONS.
diff --git a/src/01/z2ui5_cl_cc_geolocation.clas.abap b/src/01/z2ui5_cl_cc_geolocation.clas.abap
index 839ad5b2..08595fde 100644
--- a/src/01/z2ui5_cl_cc_geolocation.clas.abap
+++ b/src/01/z2ui5_cl_cc_geolocation.clas.abap
@@ -157,8 +157,8 @@ CLASS z2ui5_cl_cc_geolocation IMPLEMENTATION.
` });` && |\n| &&
`});`.
- result = mo_view->_cc_plain_xml( `` && js && `` ).
-
+* result = mo_view->_cc_plain_xml( `` && js && `` ).
+ result = mo_view->_generic( ns = `html` name = `script` )->_cc_plain_xml( js ).
ENDMETHOD.
ENDCLASS.
diff --git a/src/01/z2ui5_cl_cc_info.clas.abap b/src/01/z2ui5_cl_cc_info.clas.abap
index cace4a09..7d269ad6 100644
--- a/src/01/z2ui5_cl_cc_info.clas.abap
+++ b/src/01/z2ui5_cl_cc_info.clas.abap
@@ -117,8 +117,8 @@ ENDMETHOD.
` });` && |\n| &&
`});`.
- result = mo_view->_cc_plain_xml( `` && js && `` ).
-
+* result = mo_view->_cc_plain_xml( `` && js && `` ).
+ result = mo_view->_generic( ns = `html` name = `script` )->_cc_plain_xml( js ).
ENDMETHOD.
ENDCLASS.
diff --git a/src/01/z2ui5_cl_cc_spreadsheet.clas.abap b/src/01/z2ui5_cl_cc_spreadsheet.clas.abap
index 133b7b51..6c3b1abd 100644
--- a/src/01/z2ui5_cl_cc_spreadsheet.clas.abap
+++ b/src/01/z2ui5_cl_cc_spreadsheet.clas.abap
@@ -133,7 +133,7 @@ CLASS Z2UI5_CL_CC_SPREADSHEET IMPLEMENTATION.
` });` && |\n| &&
` });`.
- result = mo_view->_cc_plain_xml( `` && js && `` ).
-
+* result = mo_view->_cc_plain_xml( `` && js && `` ).
+ result = mo_view->_generic( ns = `html` name = `script` )->_cc_plain_xml( js ).
ENDMETHOD.
ENDCLASS.
diff --git a/src/01/z2ui5_cl_cc_timer.clas.abap b/src/01/z2ui5_cl_cc_timer.clas.abap
index 36d29c1d..0754828d 100644
--- a/src/01/z2ui5_cl_cc_timer.clas.abap
+++ b/src/01/z2ui5_cl_cc_timer.clas.abap
@@ -88,8 +88,8 @@ ENDMETHOD.
` });` && |\n| &&
`});`.
- result = mo_view->_cc_plain_xml( `` && js && `` ).
-
+* result = mo_view->_cc_plain_xml( `` && js && `` ).
+ result = mo_view->_generic( ns = `html` name = `script` )->_cc_plain_xml( js ).
ENDMETHOD.
ENDCLASS.
diff --git a/src/z2ui5_cl_xml_view.clas.abap b/src/z2ui5_cl_xml_view.clas.abap
index fa822c58..f7aac52b 100644
--- a/src/z2ui5_cl_xml_view.clas.abap
+++ b/src/z2ui5_cl_xml_view.clas.abap
@@ -3654,6 +3654,9 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
result->mo_root = result.
result->mo_parent = result.
+ INSERT VALUE #( n = `xmlns` v = `sap.m` ) INTO TABLE result->mt_prop.
+ INSERT VALUE #( n = `xmlns:mvc` v = `sap.ui.core.mvc` ) INTO TABLE result->mt_prop.
+
ENDMETHOD.
@@ -3671,6 +3674,9 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
result->mo_root = result.
result->mo_parent = result.
+ INSERT VALUE #( n = `xmlns` v = `sap.m` ) INTO TABLE result->mt_prop.
+ INSERT VALUE #( n = `xmlns:core` v = `sap.ui.core` ) INTO TABLE result->mt_prop.
+
ENDMETHOD.
@@ -4554,6 +4560,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
METHOD main_contents.
+
result = _generic( name = `mainContents`
ns = `tnt` ).
@@ -4748,6 +4755,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
METHOD nav_container.
+
result = _generic( name = `NavContainer`
t_prop = VALUE #(
( n = `initialPage` v = initialpage )
@@ -5945,8 +5953,10 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
METHOD tool_header.
+
result = _generic( name = `ToolHeader`
ns = `tnt` ).
+
ENDMETHOD.
@@ -6374,8 +6384,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
IF me = mo_root.
DATA lt_prop TYPE z2ui5_if_client=>ty_t_name_value.
- INSERT VALUE #( n = `xmlns` v = `sap.m` ) INTO TABLE mt_prop.
- INSERT VALUE #( n = `xmlns:mvc` v = `sap.ui.core.mvc` ) INTO TABLE mt_prop.
+
lt_prop = VALUE #(
* ( n = `xmlns` v = `sap.m` )
@@ -6412,7 +6421,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
( n = `xmlns:p13n` v = `sap.m.p13n` )
( n = `xmlns:upload` v = `sap.m.upload` )
( n = `xmlns:fl` v = `sap.ui.fl` )
- ( n = `xmlns:tnt ` v = `sap.tnt` ) ).
+ ( n = `xmlns:tnt` v = `sap.tnt` ) ).
LOOP AT mt_ns REFERENCE INTO DATA(lr_ns).