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

Henry Castro hcastro at collabora.com
Tue Feb 20 16:01:12 UTC 2018


 loleaflet/src/layer/tile/TileLayer.js |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b40a956c4115f4b16ecebce1107d436f8c42d385
Author: Henry Castro <hcastro at collabora.com>
Date:   Mon Feb 19 15:38:28 2018 -0400

    loleaflet: transfer to clipboard if the range of html is selected
    
    Change-Id: I6e804dcd3114596fb0041943b53cf00442af428d
    Reviewed-on: https://gerrit.libreoffice.org/50013
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 5f777182..a6fe4cba 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1818,8 +1818,7 @@ L.TileLayer = L.GridLayer.extend({
 		if (this._map._docLayer._textArea.value !== '') {
 			L.Compatibility.clipboardSet(e, this._map._docLayer._textArea.value);
 			this._map._docLayer._textArea.value = '';
-		}
-		if (this._textSelectionStart && this._textSelectionEnd && this._selectionTextContent) {
+		} else if (this._selectionTextContent) {
 			L.Compatibility.clipboardSet(e, this._selectionTextContent);
 
 			// remember the copied text, for rich copy/paste inside a document
@@ -1835,8 +1834,7 @@ L.TileLayer = L.GridLayer.extend({
 		if (this._map._docLayer._textArea.value !== '') {
 			L.Compatibility.clipboardSet(e, this._map._docLayer._textArea.value);
 			this._map._docLayer._textArea.value = '';
-		}
-		if (this._textSelectionStart && this._textSelectionEnd && this._selectionTextContent) {
+		} else if (this._selectionTextContent) {
 			L.Compatibility.clipboardSet(e, this._selectionTextContent);
 
 			// remember the copied text, for rich copy/paste inside a document


More information about the Libreoffice-commits mailing list