[Libreoffice-commits] online.git: loleaflet/src

Muhammet Kara (via logerrit) logerrit at kemper.freedesktop.org
Thu Dec 19 03:27:14 UTC 2019


 loleaflet/src/control/Control.Toolbar.js |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 92889c28aff7f240b8f21c1436672354a448ce81
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Thu Dec 19 05:23:07 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Thu Dec 19 04:26:55 2019 +0100

    Close hyperlinkPopup when we get out of InsertMode
    
    Change-Id: Ia7ae55f8a8d1b02ca7ae17c03fca7f835534237c
    Reviewed-on: https://gerrit.libreoffice.org/85463
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index bf1997688..f807684d4 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1861,6 +1861,12 @@ function onCommandStateChanged(e) {
 	}
 	else if (commandName === '.uno:InsertMode') {
 		updateToolbarItem(statusbar, 'InsertMode', $('#InsertMode').html(state ? L.Styles.insertMode[state].toLocaleString() : '<span class="ToolbarStatusInactive"> Insert mode: inactive </span>').parent().html());
+
+		if (!state && map.hyperlinkPopup) {
+			map.hyperlinkUnderCursor = null;
+			map.closePopup(map.hyperlinkPopup);
+			map.hyperlinkPopup = null;
+		}
 	}
 	else if (commandName === '.uno:StatusSelectionMode' ||
 		 commandName === '.uno:SelectionMode') {


More information about the Libreoffice-commits mailing list