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

[Andras Timar]

 loleaflet/src/control/Parts.js            |    6 +++---
 loleaflet/src/map/handler/Map.Keyboard.js |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 287768c6bcb16b0c137416681f568879f88f7e1b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Jan 15 16:26:23 2016 +0100

    loleaflet: L.Socket should not be global. (fixup)

diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 4bc834a..2447fce 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -148,7 +148,7 @@ L.Map.include({
 		if (this.getDocType() !== 'presentation') {
 			return;
 		}
-		L.Socket.sendMessage('uno .uno:InsertPage');
+		this._socket.sendMessage('uno .uno:InsertPage');
 		var docLayer = this._docLayer;
 
 		this.fire('insertpage', {
@@ -164,7 +164,7 @@ L.Map.include({
 		if (this.getDocType() !== 'presentation') {
 			return;
 		}
-		L.Socket.sendMessage('uno .uno:DuplicatePage');
+		this._socket.sendMessage('uno .uno:DuplicatePage');
 		var docLayer = this._docLayer;
 
 		this.fire('insertpage', {
@@ -181,7 +181,7 @@ L.Map.include({
 			return;
 		}
 
-		L.Socket.sendMessage('uno .uno:DeletePage');
+		this._socket.sendMessage('uno .uno:DeletePage');
 		var docLayer = this._docLayer;
 		// TO DO: Deleting all the pages causes problem.
 		if (docLayer._parts === 1) {
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js
index 7e8870f..1d6ed59 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -335,7 +335,7 @@ L.Map.Keyboard = L.Handler.extend({
 
 			// need to handle Ctrl + Alt + C separately for Firefox
 			if (e.originalEvent.key === 'c' && e.originalEvent.altKey) {
-				L.Socket.sendMessage('uno .uno:InsertAnnotation');
+				this._map._socket.sendMessage('uno .uno:InsertAnnotation');
 				return true;
 			}
 
@@ -387,7 +387,7 @@ L.Map.Keyboard = L.Handler.extend({
 			case 86: // v
 				return true;
 			case 112: // f1
-				L.Socket.sendMessage('uno .uno:NoteVisible');
+				this._map._socket.sendMessage('uno .uno:NoteVisible');
 			case 188: // ,
 				this._map._socket.sendMessage('uno .uno:SubScript');
 				return true;