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

[Szymon KÅ‚os (via logerrit)]

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

New commits:
commit 5c1dbc5fe709d74e846acf6472e35d0b1f84df81
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Apr 22 15:46:43 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri May 1 14:22:54 2020 +0200

    notebookbar: override control handlers
    
    Change-Id: I1873d0eacfa99a4bb968e8b7456886a2791bafce
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93257
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 4d26d0e7a..bb2d968e2 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -10,6 +10,22 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
 		this.map = map;
 	},
 
+	_overrideHandlers: function() {
+		this._controlHandlers['combobox'] = undefined;
+		this._controlHandlers['listbox'] = undefined;
+
+		this._toolitemHandlers['.uno:XLineColor'] = undefined;
+		this._toolitemHandlers['.uno:SelectWidth'] = undefined;
+		this._toolitemHandlers['.uno:FontColor'] = undefined;
+		this._toolitemHandlers['.uno:BackColor'] = undefined;
+		this._toolitemHandlers['.uno:CharBackColor'] = undefined;
+		this._toolitemHandlers['.uno:BackgroundColor'] = undefined;
+		this._toolitemHandlers['.uno:FrameLineColor'] = undefined;
+		this._toolitemHandlers['.uno:Color'] = undefined;
+		this._toolitemHandlers['.uno:FillColor'] = undefined;
+		this._toolitemHandlers['.uno:ResetAttributes'] = undefined;
+	},
+
 	build: function(parent, data, hasVerticalParent) {
 		this._amendJSDialogData(data);
 
@@ -70,5 +86,6 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
 L.control.notebookbarBuilder = function (options) {
 	var builder = new L.Control.NotebookbarBuilder(options);
 	builder._setup(options);
+	builder._overrideHandlers();
 	return builder;
 };