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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 7c68a7eb401c820c05b136f82d072d8306cb43e4
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 21 12:04:08 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 21 11:33:52 2019 +0100

    tdf#128461: Don't trust the _internalCacheEmpty crack in the iOS app
    
    The loleaflet code has no idea whether there is anything on the system
    clipboard or not, so let's not try to be too clever.
    
    Change-Id: I7529e0dcb5d2034efd007494b1b364c60a6e9fc6
    Reviewed-on: https://gerrit.libreoffice.org/83369
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/control/Control.ContextToolbar.js b/loleaflet/src/control/Control.ContextToolbar.js
index 1236906d3..0fcdae7e2 100644
--- a/loleaflet/src/control/Control.ContextToolbar.js
+++ b/loleaflet/src/control/Control.ContextToolbar.js
@@ -124,7 +124,7 @@ L.Control.ContextToolbar = L.Control.extend({
 
 		// check commands validity
 		var validCommands = [];
-		if (this._map && this._map._docLayer._internalCacheEmpty) {
+		if (!window.ThisIsTheiOSApp && this._map && this._map._docLayer._internalCacheEmpty) {
 			for (var k = 0; k < commands.length; ++k) {
 				var cmd = commands[k];
 				if (cmd === 'Paste')