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

[Libreoffice Gerrit user]

 loleaflet/src/layer/marker/ClipboardContainer.js |   20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

New commits:
commit 7d6fe181d510b626bd29c5b10257c9c7e6356402
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Sat Sep 8 09:19:00 2018 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Sep 11 19:46:12 2018 +0200

    loleaflet: fix cursor blinking
    
    Change-Id: I5fa9b31a8c9186efd79c49faba40b9ad84730e4c
    Reviewed-on: https://gerrit.libreoffice.org/60198
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/marker/ClipboardContainer.js b/loleaflet/src/layer/marker/ClipboardContainer.js
index 63b136183..b6f80e871 100644
--- a/loleaflet/src/layer/marker/ClipboardContainer.js
+++ b/loleaflet/src/layer/marker/ClipboardContainer.js
@@ -17,9 +17,7 @@ L.ClipboardContainer = L.Layer.extend({
 		L.DomEvent.on(this._textArea, 'copy cut paste ' +
 		              'keydown keypress keyup ' +
 		              'compositionstart compositionupdate compositionend textInput',
-		              this._map._handleDOMEvent, this._map)
-			  .on(this._textArea, 'focus', this.onGotFocus, this)
-			  .on(this._textArea, 'blur', this.onLostFocus, this);
+		              this._map._handleDOMEvent, this._map);
 	},
 
 	onRemove: function () {
@@ -30,24 +28,10 @@ L.ClipboardContainer = L.Layer.extend({
 		L.DomEvent.off(this._textArea, 'copy cut paste ' +
 		               'keydown keypress keyup ' +
 		               'compositionstart compositionupdate compositionend textInput',
-		               this._map._handleDOMEvent, this._map)
-			  .off(this._textArea, 'focus', this.onGotFocus, this)
-			  .off(this._textArea, 'blur', this.onLostFocus, this);
-	},
-
-	onGotFocus: function () {
-		this.setLatLng(this._map._docLayer._updateCursorPos());
-	},
-
-	onLostFocus: function () {
-		this._map.removeLayer(this._map._docLayer._cursorMarker);
+		               this._map._handleDOMEvent, this._map);
 	},
 
 	focus: function(focus) {
-		if (this._map._permission !== 'edit') {
-			return;
-		}
-
 		if (focus === false) {
 			this._textArea.blur();
 		} else {