[Libreoffice-commits] online.git: loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit e494a29d24347ae884b579638b98ef51bb370428
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Oct 17 17:50:39 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Oct 17 19:26:36 2019 +0200

    jsdialogs: send combobox selections correctly
    
    Change-Id: I687db5f38e24ee9e97786b736e01ac92a2f817cf

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 4615a8698..8bb22473f 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -100,8 +100,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		if (objectType == 'toolbutton' && eventType == 'click') {
 			builder.map.sendUnoCommand(data);
 		} else if (object) {
-			console.log('dialogevent ' + window.sidebarId + ' ' + object.id);
-			builder.map._socket.sendMessage('dialogevent ' + window.sidebarId + ' ' + object.id);
+			builder.map._socket.sendMessage('dialogevent ' + window.sidebarId + ' ' + object.id + ' ' + eventType + ' ' + data);
 		}
 	},
 
@@ -505,7 +504,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
 		var entries = [];
 		for (var index in data.entries) {
-			var entry = { type: 'comboboxentry', text: data.entries[index], parent: data, style: 'ui-combobox-text' };
+			var entry = { type: 'comboboxentry', text: data.entries[index], pos: index, parent: data, style: 'ui-combobox-text' };
 			entries.push(entry);
 		}
 
@@ -525,7 +524,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 			L.DomUtil.addClass(fixedtext, data.style);
 
 		$(fixedtext).click(function () {
-			builder.callback('combobox', 'selected', fixedtext.parent, fixedtext.innerHTML, builder);
+			builder.callback('combobox', 'selected', fixedtext.parent, data.pos + ';' + fixedtext.innerHTML, builder);
 		});
 	},