Skip to content

Commit 2f4ea75

Browse files
authored
Merge pull request #31 from abap2UI5-renamed/create-pull-request/patch
Automatic Update
2 parents 36abc5f + a04f651 commit 2f4ea75

File tree

5 files changed

+11
-22
lines changed

5 files changed

+11
-22
lines changed

src/01/02/z2ui6_cl_core_action.clas.abap

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,7 @@ CLASS z2ui6_cl_core_action IMPLEMENTATION.
8989
result->ms_actual-check_on_navigated = abap_true.
9090
result->ms_next-s_set-set_app_state_active = abap_true.
9191
result->mo_app->ms_draft-id_prev_app_stack = ''.
92-
" check for new app?
93-
* TRY.
94-
* DATA(lo_draft) = NEW z2ui5_cl_core_srv_draft( ).
95-
* DATA(ls_draft) = lo_draft->read_info( ms_next-o_app_leave->id_draft ).
96-
* result->mo_app->ms_draft-id = z2ui5_cl_util=>uuid_get_c32( ).
97-
* CATCH cx_root.
98-
* result->mo_app->ms_draft-id_prev_app_stack = mo_app->ms_draft-id_prev_app_stack.
99-
* RETURN.
100-
* ENDTRY.
101-
102-
* " check for already existing app?
103-
* IF mo_app->ms_draft-id_prev_app_stack IS NOT INITIAL.
104-
* ls_draft = lo_draft->read_info( mo_app->ms_draft-id_prev_app_stack ).
105-
* result->mo_app->ms_draft-id_prev_app_stack = ls_draft-id_prev_app_stack.
106-
* ENDIF.
107-
92+
result->mo_app->ms_draft-id = z2ui6_cl_util=>uuid_get_c32( ).
10893
RETURN.
10994
CATCH cx_root.
11095
ENDTRY.

src/01/03/z2ui6_cl_app_app_js.clas.abap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,8 @@ CLASS z2ui6_cl_app_app_js IMPLEMENTATION.
418418
` type: "string",` && |\n| &&
419419
` defaultValue: ""` && |\n| &&
420420
` },` && |\n| &&
421+
|\n|.
422+
result = result &&
421423
` altitudeAccuracy: {` && |\n| &&
422424
` type: "string",` && |\n| &&
423425
` defaultValue: ""` && |\n| &&
@@ -518,8 +520,6 @@ CLASS z2ui6_cl_app_app_js IMPLEMENTATION.
518520
` defaultValue: "Upload"` && |\n| &&
519521
` },` && |\n| &&
520522
` enabled: {` && |\n| &&
521-
|\n|.
522-
result = result &&
523523
` type: "boolean",` && |\n| &&
524524
` defaultValue: true` && |\n| &&
525525
` },` && |\n| &&
@@ -820,6 +820,8 @@ CLASS z2ui6_cl_app_app_js IMPLEMENTATION.
820820
` });` && |\n| &&
821821
` return oRangeDataNew;` && |\n| &&
822822
` }));` && |\n| &&
823+
|\n|.
824+
result = result &&
823825
` //we need to set token text explicitly, as setRangeData does no recalculation` && |\n| &&
824826
` input.getTokens().forEach((token, index) => {` && |\n| &&
825827
` const sTokenText = aRangeData[index].TOKENTEXT;` && |\n| &&
@@ -1020,8 +1022,6 @@ CLASS z2ui6_cl_app_app_js IMPLEMENTATION.
10201022
` DateCreateObject: (s) => new Date(s),` && |\n| &&
10211023
` // DateAbapTimestampToDate: (sTimestamp) => new sap.gantt.misc.Format.abapTimestampToDate(sTimestamp), commented for UI5 2.x compatibility` && |\n| &&
10221024
` DateAbapDateToDateObject: (d) => new Date(d.slice(0, 4), parseInt(d.slice(4, 6)) - 1, d.slice(6, 8)),` && |\n| &&
1023-
|\n|.
1024-
result = result &&
10251025
` DateAbapDateTimeToDateObject: (d, t = '000000') => new Date(d.slice(0, 4), parseInt(d.slice(4, 6)) - 1, d.slice(6, 8), t.slice(0, 2), t.slice(2, 4), t.slice(4, 6)),` && |\n| &&
10261026
` };` && |\n| &&
10271027
`}` && |\n| &&

src/01/03/z2ui6_cl_app_component_js.clas.abap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ CLASS z2ui6_cl_app_component_js IMPLEMENTATION.
3333
` if (typeof z2ui5 == 'undefined') {` && |\n| &&
3434
` z2ui5 = {};` && |\n| &&
3535
` }` && |\n| &&
36+
` if (z2ui5?.checkLocal == false) {` && |\n| &&
3637
` z2ui5 = {};` && |\n| &&
38+
` }` && |\n| &&
3739
`` && |\n| &&
3840
` z2ui5.oRouter = this.getRouter();` && |\n| &&
3941
` z2ui5.oRouter.initialize();` && |\n| &&

src/01/03/z2ui6_cl_app_view1_js.clas.abap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,8 @@ CLASS z2ui6_cl_app_view1_js IMPLEMENTATION.
418418
` break;` && |\n| &&
419419
` case 'TRIGGER_SMS':` && |\n| &&
420420
` URLHelper.triggerSms(params);` && |\n| &&
421+
|\n|.
422+
result = result &&
421423
` break;` && |\n| &&
422424
` case 'TRIGGER_TEL':` && |\n| &&
423425
` URLHelper.triggerTel(params);` && |\n| &&
@@ -518,8 +520,6 @@ CLASS z2ui6_cl_app_view1_js IMPLEMENTATION.
518520
` if (params == undefined) {` && |\n| &&
519521
` return;` && |\n| &&
520522
` }` && |\n| &&
521-
|\n|.
522-
result = result &&
523523
` if (params[msgType]?.TEXT !== undefined) {` && |\n| &&
524524
` if (msgType === 'S_MSG_TOAST') {` && |\n| &&
525525
` MessageToast.show(params[msgType].TEXT, {` && |\n| &&

src/02/z2ui6_cl_xml_view.clas.abap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3591,6 +3591,7 @@ CLASS z2ui6_cl_xml_view DEFINITION
35913591
width TYPE clike OPTIONAL
35923592
hideonnodata TYPE clike OPTIONAL
35933593
shrinkable TYPE clike OPTIONAL
3594+
visible TYPE clike OPTIONAL
35943595
view TYPE clike OPTIONAL
35953596
RETURNING
35963597
VALUE(result) TYPE REF TO z2ui6_cl_xml_view.
@@ -6008,6 +6009,7 @@ CLASS z2ui6_cl_xml_view IMPLEMENTATION.
60086009
( n = `width` v = width )
60096010
( n = `hideOnNoData` v = z2ui6_cl_util=>boolean_abap_2_json( hideonnodata ) )
60106011
( n = `shrinkable` v = z2ui6_cl_util=>boolean_abap_2_json( shrinkable ) )
6012+
( n = `visible` v = z2ui6_cl_util=>boolean_abap_2_json( visible ) )
60116013
( n = `view` v = view ) ) ).
60126014
ENDMETHOD.
60136015

0 commit comments

Comments
 (0)