notebookbar: partial updates support for listboxes

Change-Id: I90141f42bc5f1d448f3b81a926a4abef297e1a8c
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>

2 files changed, 13 insertions, 11 deletions

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 18ffc8ca55..a927e4f547 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -392,7 +392,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
 	height: 24px !important;
 }
 
-#table-fontsize .select2.select2-container {
+#fontsize.notebookbar .select2.select2-container {
 	width: 60px !important;
 }
 
@@ -401,15 +401,15 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
 	width: 32px !important;
 }
 
-#fontnamecombobox.notebookbar ~ .select2 {
+#fontnamecombobox.notebookbar .select2 {
 	width: 150px !important;
 }
 
-#fontsizecombobox.notebookbar ~ .select2 {
+#fontsizecombobox.notebookbar .select2 {
 	width: 50px !important;
 }
 
-#applystyle.notebookbar ~ .select2 {
+#applystyle.notebookbar .select2 {
 	width: 170px !important;
 }
 
@@ -576,7 +576,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
 	display: none;
 }
 
-#numbertype + .select2.select2-container {
+#numbertype .select2.select2-container {
 	width: 170px !important;
 }
 
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index d00dd3fb93..ec1b2040dd 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -225,7 +225,7 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
 				window.LastSetiOSFontNameButtonFont = state;
 			} else {
 				// refresh fonts list
-				this.map.createFontSelector('#fontnamecombobox');
+				this.map.createFontSelector('#fontnamecombobox select');
 			}
 		} else if (commandName === '.uno:StyleApply') {
 			$('#applystyle').val(state).trigger('change');
@@ -271,8 +271,10 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
 			return false;
 		}
 
-		var select = L.DomUtil.createWithId('select', data.id, parentContainer);
-		$(select).addClass(builder.options.cssClass);
+		var container = L.DomUtil.createWithId('div', data.id, parentContainer);
+		L.DomUtil.addClass(container, builder.options.cssClass);
+		L.DomUtil.addClass(container, 'ui-combobox');
+		var select = L.DomUtil.create('select', builder.options.cssClass, container);
 
 		var processedData = [];
 
@@ -281,10 +283,10 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
 
 		if (!data.entries || data.entries.length === 0) {
 			if (isFontSelector) {
-				builder.map.createFontSelector('#' + data.id);
+				builder.map.createFontSelector('#' + data.id + ' select');
 				return;
 			} else if (isFontSizeSelector) {
-				builder.map.createFontSizeSelector('#' + data.id);
+				builder.map.createFontSizeSelector('#' + data.id + ' select');
 				return;
 			}
 		}
@@ -307,7 +309,7 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
 
 		$(select).on('select2:select', function (e) {
 			var value = e.params.data.id + ';' + e.params.data.text;
-			builder.callback('combobox', 'selected', select, value, builder);
+			builder.callback('combobox', 'selected', container, value, builder);
 		});
 
 		return false;