[Libreoffice-commits] online.git: loleaflet/debug loleaflet/dist loleaflet/reference.html loleaflet/spec

[Andras Timar]

 loleaflet/debug/document/document_simple_example.html |    2 +-
 loleaflet/dist/admin/adminAnalytics.html              |    4 ++--
 loleaflet/dist/loleaflet.html                         |    2 +-
 loleaflet/reference.html                              |    6 +++---
 loleaflet/spec/headlessLoadTest.js                    |    2 +-
 loleaflet/spec/tilebench/TileBenchSpec.js             |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit abe330d3906d6c08a1df09f381e23a5030bd9653
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Mar 23 22:02:50 2016 +0100

    loleaflet: ws:// -> wss://

diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html
index 790aa1a..78cb3c6 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -74,7 +74,7 @@
         vex.dialog.alert('Wrong WOPISrc, usage: WOPISrc=valid encoded URI,  or file_path, usage: file_path=/path/to/doc/');
     }
     if (host === '') {
-        vex.dialog.alert('Wrong host, usage: host=ws://localhost:9980');
+        vex.dialog.alert('Wrong host, usage: host=wss://localhost:9980');
     }
     var docURL = wopiSrc !== '' ? wopiSrc : filePath;
 
diff --git a/loleaflet/dist/admin/adminAnalytics.html b/loleaflet/dist/admin/adminAnalytics.html
index a2a9ad6..4a4c92a 100644
--- a/loleaflet/dist/admin/adminAnalytics.html
+++ b/loleaflet/dist/admin/adminAnalytics.html
@@ -56,8 +56,8 @@
         </div>
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav navbar-right">
-	    <li><a href="admin.html?host=ws://localhost:9989">Dashboard</a></li>
-            <li><a href="adminSettings.html?host=ws://localhost:9989">Settings</a></li>
+	    <li><a href="admin.html?host=wss://localhost:9989">Dashboard</a></li>
+            <li><a href="adminSettings.html?host=wss://localhost:9989">Settings</a></li>
             <li><a href="#">Help</a></li>
           </ul>
           <form class="navbar-form navbar-right">
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 8332828..9f89fb6 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -277,7 +277,7 @@
         vex.dialog.alert('Wrong WOPISrc, usage: WOPISrc=valid encoded URI,  or file_path, usage: file_path=/path/to/doc/');
     }
     if (host === '') {
-        vex.dialog.alert('Wrong host, usage: host=ws://localhost:9980');
+        vex.dialog.alert('Wrong host, usage: host=wss://localhost:9980');
     }
     var docURL = wopiSrc !== '' ? wopiSrc : filePath;
 
diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 43f9fe6..8cddd3f 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -173,7 +173,7 @@
 <pre><code class="javascript">// initialize the map on the "map" div with a server and document URL
 var map = L.map('map', {
     doc: 'file:///path/to/document',
-    server: 'ws://localhost'
+    server: 'wss://localhost'
 });</code></pre>
 
 <h3 id="map-constructor" class="left">Creation</h3>
@@ -1401,7 +1401,7 @@ var map = L.map('map', {
 <pre><code class="javascript">
 var map = L.map('map', {
     doc: 'file:///path/to/document',
-    server: 'ws://localhost',
+    server: 'wss://localhost',
     documentContainer: 'document-container'
 });</code></pre>
 
@@ -1446,7 +1446,7 @@ unexpected behaviour.</h4>
 		<td><code>String</code></td>
 		<td><code><span class="literal">undefined</span></code></td>
 		<td>The websocket server hosting loolwsd using the <code>ws:</code> protocol.
-		    Example: ws://localhost:9980</td>
+		    Example: wss://localhost:9980</td>
 	</tr>
 	<tr>
 		<td><code><b>webserver</b></code></td>
diff --git a/loleaflet/spec/headlessLoadTest.js b/loleaflet/spec/headlessLoadTest.js
index eeefcc4..2b11da0 100644
--- a/loleaflet/spec/headlessLoadTest.js
+++ b/loleaflet/spec/headlessLoadTest.js
@@ -17,7 +17,7 @@ describe('LoadTest', function () {
 		testsToRun = 500;
 		tileSize = 256,
 		tileSizeTwips = 3000,
-		host = 'ws://localhost:9980';
+		host = 'wss://localhost:9980';
 
 	var _parseServerCmd = function (msg) {
 		var tokens = msg.split(/[ \n]+/);
diff --git a/loleaflet/spec/tilebench/TileBenchSpec.js b/loleaflet/spec/tilebench/TileBenchSpec.js
index 4d3077b..ce57095 100644
--- a/loleaflet/spec/tilebench/TileBenchSpec.js
+++ b/loleaflet/spec/tilebench/TileBenchSpec.js
@@ -25,7 +25,7 @@ describe('TileBench', function () {
 		var dir = htmlPath.substring(0, htmlPath.lastIndexOf('/'));
 		var fileURL = 'file://' + dir + '/data/eval.odt';
 		fileURL = getParameterByName('file_path') || fileURL;
-		var server = getParameterByName('host') || 'ws://localhost:9980';
+		var server = getParameterByName('host') || 'wss://localhost:9980';
 		// initialize the map and load the document
 		map = L.map('map', {
 			server: server,