diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap index aab02496..2d3dedff 100644 --- a/src/z2ui5_cl_http_handler.clas.abap +++ b/src/z2ui5_cl_http_handler.clas.abap @@ -117,7 +117,7 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION. ` }` && |\n| && ` );` && |\n| && ` }` && |\n| && - ` if (sap.z2ui5.oResponse.PARAMS.S_POPUP.CHECK_CLOSE == true) {` && |\n| && + ` if (sap.z2ui5.oResponse.PARAMS.S_POPUP.CHECK_DESTROY == true) {` && |\n| && ` sap.z2ui5.oController.PopupClose();` && |\n| && ` }` && |\n| && ` if (sap.z2ui5.oResponse.PARAMS.S_POPUP.XML) {` && |\n| && @@ -151,7 +151,7 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION. ` );` && |\n| && ` }` && |\n| && ` }` && |\n| && - ` if (sap.z2ui5.oResponse.PARAMS.S_POPOVER.CHECK_CLOSE == true) {` && |\n| && + ` if (sap.z2ui5.oResponse.PARAMS.S_POPOVER.CHECK_DESTROY == true) {` && |\n| && ` sap.z2ui5.oController.PopoverClose();` && |\n| && ` }` && |\n| && ` if (sap.z2ui5.oResponse.PARAMS.S_POPOVER.XML) {` && |\n| && @@ -306,6 +306,8 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION. ` if (sap.z2ui5.oResponse.PARAMS.S_VIEW.CHECK_UPDATE_MODEL == true) {` && |\n| && ` sap.z2ui5.oView.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL)); }` && |\n| && ` if (sap.z2ui5.oResponse.PARAMS.S_VIEW_NEST.CHECK_UPDATE_MODEL == true) { sap.z2ui5.oViewNest.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL)); }` && |\n| && + ` if (sap.z2ui5.oResponse.PARAMS.S_POPUP.CHECK_UPDATE_MODEL == true) { sap.z2ui5.oViewPopup.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL)); }` && |\n| && + ` if (sap.z2ui5.oResponse.PARAMS.S_POPOVER.CHECK_UPDATE_MODEL == true) { sap.z2ui5.oViewPopover.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL)); }` && |\n| && ` }` && |\n| && ` ` && |\n| && ` sap.z2ui5.oController.onAfterRendering();` && |\n| && diff --git a/src/z2ui5_cl_http_handler.clas.locals_imp.abap b/src/z2ui5_cl_http_handler.clas.locals_imp.abap index b5c5a1a0..81f3a643 100644 --- a/src/z2ui5_cl_http_handler.clas.locals_imp.abap +++ b/src/z2ui5_cl_http_handler.clas.locals_imp.abap @@ -667,15 +667,17 @@ CLASS z2ui5_lcl_fw_handler DEFINITION. check_update_model TYPE abap_bool, END OF s_view_nest, BEGIN OF s_popup, - xml TYPE string, - id TYPE string, - check_close TYPE abap_bool, + xml TYPE string, + id TYPE string, + check_destroy TYPE abap_bool, + check_update_model TYPE abap_bool, END OF s_popup, BEGIN OF s_popover, - xml TYPE string, - id TYPE string, - open_by_id TYPE string, - check_close TYPE abap_bool, + xml TYPE string, + id TYPE string, + open_by_id TYPE string, + check_destroy TYPE abap_bool, + check_update_model TYPE abap_bool, END OF s_popover, BEGIN OF s_cursor, id TYPE string, @@ -1301,9 +1303,9 @@ CLASS z2ui5_lcl_fw_handler IMPLEMENTATION. TRY. DATA(lo_cursor) = so_body->get_attribute( `OCURSOR` ). result->ms_actual-s_cursor-id = lo_cursor->get_attribute( `ID` )->get_val( ). - result->ms_actual-s_cursor-cursorpos = lo_cursor->get_attribute( `CURSORPOS` )->get_val( ). - result->ms_actual-s_cursor-selectionend = lo_cursor->get_attribute( `SELECTIONEND` )->get_val( ). - result->ms_actual-s_cursor-selectionstart = lo_cursor->get_attribute( `SELECTIONSTART` )->get_val( ). +* result->ms_actual-s_cursor-cursorpos = lo_cursor->get_attribute( `CURSORPOS` )->get_val( ). +* result->ms_actual-s_cursor-selectionend = lo_cursor->get_attribute( `SELECTIONEND` )->get_val( ). +* result->ms_actual-s_cursor-selectionstart = lo_cursor->get_attribute( `SELECTIONSTART` )->get_val( ). CATCH cx_root. ENDTRY. @@ -1693,7 +1695,7 @@ CLASS z2ui5_lcl_fw_client IMPLEMENTATION. METHOD z2ui5_if_client~popup_display. - mo_handler->ms_next-s_set-s_popup-check_close = abap_false. + mo_handler->ms_next-s_set-s_popup-check_destroy = abap_false. mo_handler->ms_next-s_set-s_popup-xml = val. @@ -1786,23 +1788,23 @@ CLASS z2ui5_lcl_fw_client IMPLEMENTATION. ENDMETHOD. - METHOD z2ui5_if_client~popover_close. + METHOD z2ui5_if_client~popover_destroy. - mo_handler->ms_next-s_set-s_popover-check_close = abap_true. + mo_handler->ms_next-s_set-s_popover-check_destroy = abap_true. ENDMETHOD. METHOD z2ui5_if_client~popover_display. - mo_handler->ms_next-s_set-s_popover-check_close = abap_false. + mo_handler->ms_next-s_set-s_popover-check_destroy = abap_false. mo_handler->ms_next-s_set-s_popover-xml = xml. mo_handler->ms_next-s_set-s_popover-open_by_id = by_id. ENDMETHOD. - METHOD z2ui5_if_client~popup_close. + METHOD z2ui5_if_client~popup_destroy. - mo_handler->ms_next-s_set-s_popup-check_close = abap_true. + mo_handler->ms_next-s_set-s_popup-check_destroy = abap_true. ENDMETHOD. @@ -1825,4 +1827,16 @@ CLASS z2ui5_lcl_fw_client IMPLEMENTATION. ENDMETHOD. + METHOD z2ui5_if_client~popover_model_update. + + mo_handler->ms_next-s_set-s_popover-check_update_model = abap_true. + + ENDMETHOD. + + METHOD z2ui5_if_client~popup_model_update. + + mo_handler->ms_next-s_set-s_popup-check_update_model = abap_true. + + ENDMETHOD. + ENDCLASS. diff --git a/src/z2ui5_if_client.intf.abap b/src/z2ui5_if_client.intf.abap index d27b360d..8188934b 100644 --- a/src/z2ui5_if_client.intf.abap +++ b/src/z2ui5_if_client.intf.abap @@ -32,11 +32,11 @@ INTERFACE z2ui5_if_client event TYPE string, t_event_arg TYPE string_table, t_scroll_pos TYPE ty_t_name_value, - check_launchpad_active TYPE abap_bool, id TYPE string, id_prev TYPE string, id_prev_app TYPE string, id_prev_app_stack TYPE string, + check_launchpad_active TYPE abap_bool, check_on_navigated TYPE abap_bool, BEGIN OF s_cursor, id TYPE string, @@ -81,14 +81,18 @@ INTERFACE z2ui5_if_client IMPORTING val TYPE clike. - METHODS popup_close. + METHODS popup_model_update. + + METHODS popup_destroy. + + METHODS popover_model_update. METHODS popover_display IMPORTING xml TYPE clike by_id TYPE clike. - METHODS popover_close. + METHODS popover_destroy. METHODS get RETURNING