loleaflet/spec/loleaflet/control/PartsSpec.js | 2 +- loleaflet/spec/loleaflet/control/PermissionSpec.js | 2 +- loleaflet/spec/loleaflet/control/SearchSpec.js | 2 +- loleaflet/spec/loleaflet/control/ToolbarSpec.js | 2 +- loolwsd/README | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-)
New commits: commit 8e799c6569728e2aa4390b5f4bf1c44611c48410 Author: Pranav Kant <[email protected]> Date: Tue Mar 22 01:27:18 2016 +0530 loleaflet: Fix unit tests to use secure websockets Change-Id: I6441d994bde40fa97ffe65be8c2a78e114dd7316 diff --git a/loleaflet/spec/loleaflet/control/PartsSpec.js b/loleaflet/spec/loleaflet/control/PartsSpec.js index f2edc1b..93b4292 100644 --- a/loleaflet/spec/loleaflet/control/PartsSpec.js +++ b/loleaflet/spec/loleaflet/control/PartsSpec.js @@ -8,7 +8,7 @@ describe('Parts and Pages', function () { var fileURL = 'file://' + dir + '/data/eval.odt'; // initialize the map and load the document map = L.map('map', { - server: 'ws://localhost:9980', + server: 'wss://localhost:9980', doc: fileURL, edit: false, readOnly: false diff --git a/loleaflet/spec/loleaflet/control/PermissionSpec.js b/loleaflet/spec/loleaflet/control/PermissionSpec.js index 3d8b456..4abfe78 100644 --- a/loleaflet/spec/loleaflet/control/PermissionSpec.js +++ b/loleaflet/spec/loleaflet/control/PermissionSpec.js @@ -8,7 +8,7 @@ describe('Permissions', function () { var fileURL = 'file://' + dir + '/data/eval.odt'; // initialize the map and load the document map = L.map('map', { - server: 'ws://localhost:9980', + server: 'wss://localhost:9980', doc: fileURL, edit: false, readOnly: false diff --git a/loleaflet/spec/loleaflet/control/SearchSpec.js b/loleaflet/spec/loleaflet/control/SearchSpec.js index b5a54a7..6956f8d 100644 --- a/loleaflet/spec/loleaflet/control/SearchSpec.js +++ b/loleaflet/spec/loleaflet/control/SearchSpec.js @@ -8,7 +8,7 @@ describe('Search', function () { var fileURL = 'file://' + dir + '/data/eval.odt'; // initialize the map and load the document map = L.map('map', { - server: 'ws://localhost:9980', + server: 'wss://localhost:9980', doc: fileURL, edit: false, readOnly: false diff --git a/loleaflet/spec/loleaflet/control/ToolbarSpec.js b/loleaflet/spec/loleaflet/control/ToolbarSpec.js index f83480e..a8204c4 100644 --- a/loleaflet/spec/loleaflet/control/ToolbarSpec.js +++ b/loleaflet/spec/loleaflet/control/ToolbarSpec.js @@ -9,7 +9,7 @@ describe('Toolbar', function () { var fileURL = 'file://' + dir + '/data/eval.odt'; // initialize the map and load the document map = L.map('map', { - server: 'ws://localhost:9980', + server: 'wss://localhost:9980', doc: fileURL, edit: false, readOnly: false, commit 1cfca1766c24eb8b0a48d691069d11149812a1ef Author: Pranav Kant <[email protected]> Date: Tue Mar 22 01:02:45 2016 +0530 loolwsd: Add information about admin panel to README Change-Id: Ic163eec1bdcae4f4b3fcc107c990f43e4b724c19 diff --git a/loolwsd/README b/loolwsd/README index 5d1e081..28d1bdc 100644 --- a/loolwsd/README +++ b/loolwsd/README @@ -171,6 +171,14 @@ document, based on the public URI as unique key, and forward the request to this existing Kit, which then loads a new view to the document. +There is an additional pipe that kit processes and broker have +write access to. This pipe is 'notify' pipe. All the important +changes are notified on this pipe. The pipe is read by the admin +manager continously and it keeps updating the AdminModel object. +AdminModel object has subscribers which corresponds to admin +panel sessions. Subscriber can subscribe to specific commands +to get live notifications about, and to update the UI accordingly. + Whether a document is loaded for the first time, or this is a new view on an existing one, the Kit connects via a socket to WSD on an internal port. WSD acts as a bridge between _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
