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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |   63 ++++++++++++++++++++++-
 loleaflet/src/layer/tile/TileLayer.js            |    4 -
 2 files changed, 64 insertions(+), 3 deletions(-)

New commits:
commit 403fe10c9d068317359310bd6005ed7f2163715d
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Nov 26 15:26:31 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Nov 28 09:39:10 2019 +0100

    jsdialog: handle graphic items updates
    
    Change-Id: I3a04cefe34ce8ca8806d93a72e047563d9c4c26b
    Reviewed-on: https://gerrit.libreoffice.org/83862
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-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 47ab90ca2..f7277bff5 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -101,7 +101,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		if (objectType == 'toolbutton' && eventType == 'click') {
 			builder.map.sendUnoCommand(data);
 		} else if (object) {
-			var message = 'dialogevent ' + window.sidebarId + ' {\"id\":\"' + object.id + '\", \"cmd\": \"' + eventType + '\", \"data\":\"' + data.replace('"', '\\"') + '\"}';
+			data = typeof data === 'string' ? data.replace('"', '\\"') : data;
+			var message = 'dialogevent ' + window.sidebarId + ' {\"id\":\"' + object.id + '\", \"cmd\": \"' + eventType + '\", \"data\":\"' + data + '\"}';
 			builder.map._socket.sendMessage(message);
 		}
 	},
@@ -543,6 +544,24 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		case 'fillgrad1':
 		case 'fillgrad2':
 			return '.uno:FillGradient';
+
+		case 'setbrightness':
+			return '.uno:GrafLuminance';
+
+		case 'setcontrast':
+			return '.uno:GrafContrast';
+
+		case 'setred':
+			return '.uno:GrafRed';
+
+		case 'setgreen':
+			return '.uno:GrafGreen';
+
+		case 'setblue':
+			return '.uno:GrafBlue';
+
+		case 'setgamma':
+			return '.uno:GrafGamma';
 		}
 
 		return null;
@@ -711,6 +730,48 @@ L.Control.JSDialogBuilder = L.Control.extend({
 				return state.endcolor;
 			}
 			break;
+
+		case 'setbrightness':
+			state = items.getItemValue('.uno:GrafLuminance');
+			if (state) {
+				return state.replace(',', '.');
+			}
+			break;
+
+		case 'setcontrast':
+			state = items.getItemValue('.uno:GrafContrast');
+			if (state) {
+				return state.replace(',', '.');
+			}
+			break;
+
+		case 'setred':
+			state = items.getItemValue('.uno:GrafRed');
+			if (state) {
+				return state.replace(',', '.');
+			}
+			break;
+
+		case 'setgreen':
+			state = items.getItemValue('.uno:GrafGreen');
+			if (state) {
+				return state.replace(',', '.');
+			}
+			break;
+
+		case 'setblue':
+			state = items.getItemValue('.uno:GrafBlue');
+			if (state) {
+				return state.replace(',', '.');
+			}
+			break;
+
+		case 'setgamma':
+			state = items.getItemValue('.uno:GrafGamma');
+			if (state) {
+				return state.replace(',', '.');
+			}
+			break;
 		}
 
 		return null;
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 1be76a03c..a84bed916 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1451,8 +1451,8 @@ L.TileLayer = L.GridLayer.extend({
 
 			for (var i = 0; i < json.items.length; i++) {
 				var item = json.items[i];
-				if (item.which && item.data) {
-					this._map.fire('commandstatechanged', {commandName: item.which, state: item.data});
+				if (item.commandName && item.state) {
+					this._map.fire('commandstatechanged', item);
 				}
 			}
 		} else {