From 38c1a37940aaaaaf6138f72c976815a420b2d2c5 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 21 Nov 2022 11:42:53 +0400 Subject: [PATCH] [DE PE SSE mobile] Fix Bug 59790 --- apps/documenteditor/mobile/src/controller/add/AddLink.jsx | 4 ++-- .../presentationeditor/mobile/src/controller/add/AddLink.jsx | 4 ++-- apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx index 8b80b1488..3c337e851 100644 --- a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx @@ -15,7 +15,7 @@ class AddLinkController extends Component { closeModal () { if ( Device.phone ) { - f7.popup.close('#add-link-popup'); + f7.popup.close('.add-popup'); } else { f7.popover.close('#add-link-popover'); } @@ -59,7 +59,7 @@ class AddLinkController extends Component { props.put_ToolTip(tip); api.add_Hyperlink(props); - this.props.isNavigate ? f7.views.current.router.back() : this.closeModal(); + this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal(); } componentDidMount() { diff --git a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx index c1c7ac74a..6d1721ae1 100644 --- a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx @@ -28,7 +28,7 @@ class AddLinkController extends Component { closeModal () { if ( Device.phone ) { - f7.popup.close('#add-link-popup'); + f7.popup.close('.add-popup'); } else { f7.popover.close('#add-link-popover'); } @@ -112,7 +112,7 @@ class AddLinkController extends Component { props.put_Text(null); api.add_Hyperlink(props); - this.props.isNavigate ? f7.views.current.router.back() : this.closeModal(); + this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal(); } getTextDisplay () { diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx index 5caa9d41b..a42b989b4 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx @@ -110,14 +110,13 @@ class AddLinkController extends Component { } link.asc_setTooltip(args.tooltip); - api.asc_insertHyperlink(link); - this.props.isNavigate ? f7.views.current.router.back() : this.closeModal(); + this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal(); } closeModal () { if ( Device.phone ) { - f7.popup.close('#add-link-popup'); + f7.popup.close('.add-popup'); } else { f7.popover.close('#add-link-popover'); }