[Libreoffice-commits] online.git: 2 commits - kit/ChildSession.cpp loleaflet/src

[Tamás Zolnai (via logerrit)]

 kit/ChildSession.cpp                             |    3 ++-
 loleaflet/src/control/Control.ContextMenu.js     |    1 +
 loleaflet/src/control/Control.JSDialogBuilder.js |    4 ++++
 loleaflet/src/control/Control.MobileWizard.js    |    3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 2e9dfc2851a50063ffa4f202e62a34ccd3cf09fd
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Dec 3 13:31:15 2019 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Dec 3 14:44:17 2019 +0100

    Context menu wizard: always close by clicking on an item.
    
    Change-Id: Ie51b5266e41d488d93f74e5dcc547aa0f5f41aa5
    Reviewed-on: https://gerrit.libreoffice.org/84342
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 87f2ad02a..30f539493 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -103,6 +103,7 @@ L.Control.ContextMenu = L.Control.extend({
 		}
 		var contextMenu = this._createContextMenuStructure(obj);
 		if (window.mode.isMobile()) {
+			window.contextMenuWizard = true;
 			var menuData = this.getMenuStructureForMobileWizard(contextMenu, true, '');
 			map.fire('mobilewizard', menuData);
 		} else {
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index b7e1ebec9..7de526461 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1404,6 +1404,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
 					window.onClick(null, 'insertion_mobile_wizard');
 				else if (window.mobileMenuWizard)
 					$('#main-menu-state').click()
+				else if (window.contextMenuWizard) {
+					window.contextMenuWizard = false;
+					builder.map.fire('closemobilewizard');
+				}
 			});
 		} else {
 			console.debug('Builder used outside of mobile wizard: please implement the click handler');
diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index 2af4f2cf9..c02e6d5fc 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -127,6 +127,9 @@ L.Control.MobileWizard = L.Control.extend({
 				w2ui['actionbar'].click('insertion_mobile_wizard')
 			} else if (window.mobileMenuWizard === true) {
 				$('#main-menu-state').click()
+			} else if (window.contextMenuWizard) {
+				window.contextMenuWizard = false;
+				this.map.fire('closemobilewizard');
 			}
 		} else {
 			this._currentDepth--;
commit 1e6ff5587847b8df1bf4fadf5ffb8cded038750a
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue Dec 3 13:21:45 2019 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Dec 3 14:44:09 2019 +0100

    Spelling context menu: Fix execution of LanguageStatus
    
    Change-Id: Ia309246ee37c6c598e518e66f96fc80e1320ce55
    Reviewed-on: https://gerrit.libreoffice.org/84341
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 7e8c1f70c..45ee614e4 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -366,7 +366,8 @@ bool ChildSession::_handleInput(const char *buffer, int length)
         else if (tokens[0] == "uno")
         {
             // SpellCheckApplySuggestion might contain non separator spaces
-            if (tokens[1].find(".uno:SpellCheckApplySuggestion") != std::string::npos)
+            if (tokens[1].find(".uno:SpellCheckApplySuggestion") != std::string::npos ||
+                tokens[1].find(".uno:LanguageStatus") != std::string::npos)
             {
                 std::vector<std::string> newTokens;
                 newTokens.push_back(tokens[0]);