loleaflet/debug/document/document_simple_example.html | 2 +-
loleaflet/spec/loadtest.html | 2 +-
loleaflet/spec/loadtest/LoadTestSpec.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ac65edc9103ef32916bce80ade419523b38b5616
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Tue Mar 22 19:27:22 2016 -0400
loleaflet: fixed sample and loadtest to support https
To run loadtest, point the browser to:
file:///abs/path/to/loleaflet/spec/loadtest.html
To run the sample, point the browser to:
file:///abs/path/to/loleaflet/debug/document/document_simple_example.html?file_path=/abs/doc/path/test.odt&host=wss://localhost:9980
Change-Id: If3e9aa2fc321e734ad912158b06ecb3370e37418
Reviewed-on: https://gerrit.libreoffice.org/23454
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loleaflet/debug/document/document_simple_example.html
b/loleaflet/debug/document/document_simple_example.html
index 271fac2..790aa1a 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -25,7 +25,7 @@
<body>
<script src="../../dist/leaflet-src.js"></script>
<script src="../../plugins/draw-0.2.4/dist/leaflet.draw.js"></script>
- <script
src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js";></script>
+ <script
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js";></script>
<script>window.jQuery || document.write('<script
src="../../dist/scrollbar/jquery-1.11.0.min.js"><\/script>')</script>
<script src="../../dist/scrollbar/jquery.mCustomScrollbar.js"></script>
<script src="../../dist/contextMenu/jquery.ui.position.min.js"></script>
diff --git a/loleaflet/spec/loadtest.html b/loleaflet/spec/loadtest.html
index 4734ff1..72b3058 100644
--- a/loleaflet/spec/loadtest.html
+++ b/loleaflet/spec/loadtest.html
@@ -15,7 +15,7 @@
<script type="text/javascript"
src="../node_modules/mocha/mocha.js"></script>
<script type="text/javascript"
src="../node_modules/happen/happen.js"></script>
<script type="text/javascript" src="sinon.js"></script>
- <script
src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js";></script>
+ <script
src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js";></script>
<script>window.jQuery || document.write('<script
src="../dist/scrollbar/jquery-1.11.0.min.js"><\/script>')</script>
<script src="../dist/scrollbar/jquery.mCustomScrollbar.js"></script>
<script src="../dist/contextMenu/jquery.contextMenu.js"></script>
diff --git a/loleaflet/spec/loadtest/LoadTestSpec.js
b/loleaflet/spec/loadtest/LoadTestSpec.js
index 0099b63..4093630 100644
--- a/loleaflet/spec/loadtest/LoadTestSpec.js
+++ b/loleaflet/spec/loadtest/LoadTestSpec.js
@@ -34,7 +34,7 @@ describe('LoadTest', function () {
it('Load the document', function (done) {
map = L.map('map-test', {
- server: 'ws://localhost:9980',
+ server: 'wss://localhost:9980',
doc: docPath + testDoc,
edit: false,
readOnly: false
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
