[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - loleaflet/src

Aron Budea (via logerrit) logerrit at kemper.freedesktop.org
Fri Feb 28 15:37:41 UTC 2020


 loleaflet/src/control/Control.ContextMenu.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a85baf056536213197c6f551081c2c17048a029f
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Wed Feb 26 16:51:48 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Feb 28 16:37:23 2020 +0100

    Replace 'includes' with '$.inArray' for IE11
    
    Regression from b36d56bf5b022bf4b41d062a82326b5ea57b8dbf.
    
    Change-Id: I270afb92366fa8992c08a79bd1c561117a18bb9c
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89560
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit 6fdad3ba94ddbc35791b89da475d11446fea420f)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89573
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index b5db30d02..5b29ce168 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -109,7 +109,7 @@ L.Control.ContextMenu = L.Control.extend({
 		var contextMenu = this._createContextMenuStructure(obj);
 		var spellingContextMenu = false;
 		for (var menuItem in contextMenu) {
-			if (menuItem.includes('.uno:SpellCheckIgnore')) {
+			if ($.inArray('.uno:SpellCheckIgnore', menuItem) !== -1) {
 				spellingContextMenu = true;
 				break;
 			}


More information about the Libreoffice-commits mailing list