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

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Thu May 21 13:58:35 UTC 2020


 loleaflet/src/control/Control.JSDialogBuilder.js |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 6a295dd1adcb8fb9524d31b0a8b4414ffcaeb872
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed May 6 10:49:47 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu May 21 15:58:17 2020 +0200

    jsdialog: use edit instead of combobox in find & replace
    
    Change-Id: I1d365ef8ac3860ffa581f830c1b989842532723a
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94627
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 492bbe3dd..6124fc584 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1393,8 +1393,17 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		if (data.id === 'applystyle' ||
 			data.id === 'fontnamecombobox' ||
 			data.id === 'fontsizecombobox' ||
-			data.id === 'FontBox')
+			data.id === 'FontBox') {
 			builder._listboxControl(parentContainer, data, builder);
+		} else if (data.id === 'searchterm' ||
+			data.id === 'replaceterm') {
+			// Replace combobox with edit in mobile find & replace dialog
+			var callback = function(value) {
+				builder.callback('combobox', 'change', data, value, builder);
+			};
+
+			builder._editControl(parentContainer, data, builder, callback);
+		}
 		else
 			builder._explorableEditControl(parentContainer, data, builder);
 	},


More information about the Libreoffice-commits mailing list