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

Jan Holesovsky kendy at collabora.com
Thu Feb 11 19:26:46 UTC 2016


 loleaflet/src/map/Map.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f73c0980e29df3606038236e4525c3f9c2993a04
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Feb 11 20:25:04 2016 +0100

    loleaflet: Allow wss: protocol as a base for the image upload URL too.

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d048556..acc979f 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -50,7 +50,7 @@ L.Map = L.Evented.extend({
 
 		if (options.webserver === undefined) {
 			var protocol = window.location.protocol === 'file:' ? 'http:' : window.location.protocol;
-			options.webserver = options.server.replace(/^ws:/i, protocol);
+			options.webserver = options.server.replace(/^(ws|wss):/i, protocol);
 		}
 
 		// we are adding components like '/insertfile' at the end which would


More information about the Libreoffice-commits mailing list