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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 1abe1ff7481e8b30d0fc3307e1a73f83bcc88886
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Sep 30 13:13:42 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 30 14:19:44 2020 +0200

    Use correct position for sidebar tooltips
    
    Remove leftovers after old tooltips
    
    Change-Id: I935285150ed35c922fbcddbe7ff3af9a7c07fd34
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103682
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index af72bdfb4..279bf1720 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -377,6 +377,7 @@ L.Control.LokDialog = L.Control.extend({
 			if (parent) { // this is a floating window
 				if (e.rectangle && this._dialogs[parent].childistooltip === true) {
 					// resize tooltips on invalidation
+					this._removeDialogChild(parent);
 					left = this._dialogs[parent].childx;
 					top = this._dialogs[parent].childy;
 					width = parseInt(e.rectangle.split(',')[2]);
@@ -1674,11 +1675,15 @@ L.Control.LokDialog = L.Control.extend({
 			$('#' + dialogId).height(canvasHeight + 'px');
 		}
 		this._dialogs[dialogId].childid = undefined;
+		this._dialogs[dialogId].childx = undefined;
+		this._dialogs[dialogId].childy = undefined;
 	},
 
 	_removeDialogChild: function(id) {
 		$('#' + this._toStrId(id) + '-floating').remove();
 		this._dialogs[id].childid = undefined;
+		this._dialogs[id].childx = undefined;
+		this._dialogs[id].childy = undefined;
 	},
 
 	_createDialogChild: function(childId, parentId, top, left) {