[Libreoffice-commits] online.git: 2 commits - browsersync-config.js loleaflet/Makefile.am loleaflet/reference.html

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon May 20 07:59:52 UTC 2019


 browsersync-config.js    |    2 +-
 loleaflet/Makefile.am    |    6 +++++-
 loleaflet/reference.html |   25 +++++++++++++------------
 3 files changed, 19 insertions(+), 14 deletions(-)

New commits:
commit f5954a015be8a11a093f1b5528ef6811015f650d
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri May 17 11:26:47 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Mon May 20 09:59:45 2019 +0200

    Browsersync: Also sync html files
    
    Change-Id: I55db923954fc0c59e1726640c980a539a12293ba
    Reviewed-on: https://gerrit.libreoffice.org/72455
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/browsersync-config.js b/browsersync-config.js
index c11f4d370..9d8266408 100644
--- a/browsersync-config.js
+++ b/browsersync-config.js
@@ -16,7 +16,7 @@ module.exports = {
     "ui": {
         "port": 3001
     },
-    "files": ["loleaflet/dist/**/*.css", "loleaflet/dist/**/*.js"],
+    "files": ["loleaflet/dist/**/*.css", "loleaflet/dist/**/*.js", "loleaflet/dist/*.html"],
     "watchEvents": [
         "change"
     ],
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 4c09cc590..cb7282248 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -252,7 +252,11 @@ $(builddir)/dist/images/%: $(srcdir)/images/%
 
 $(builddir)/dist/%.html: $(srcdir)/html/%.html
 	@mkdir -p $(dir $@)
-	@cp $< $@
+	@if test -z '$(ENABLE_BROWSERSYNC)'; then \
+		`cp $< $@`; \
+	else \
+		`ln -sf $(abs_srcdir)/$< $@`; \
+	fi
 
 $(builddir)/dist/src/%.js: $(srcdir)/src/%.js
 	@mkdir -p $(dir $@)
commit e23ea286215134d14e5c58fe9b87843c6b747fba
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri May 17 09:20:04 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Mon May 20 09:59:34 2019 +0200

    Reference: Add heading markup to headings
    
    Change-Id: I426a49a17488b88924845fefb549126844c962a2
    Reviewed-on: https://gerrit.libreoffice.org/72448
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 48aa18ca8..d6d7732f7 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -2858,7 +2858,7 @@ Editor to WOPI host
 </table>
 
 <h3 id="loleaflet-postmessage-sessions">Session Management</h3>
-WOPI Host to editor
+<h4>WOPI Host to editor</h4>
 <table data-id='postmessage-sessions-management'>
 	<tr>
 		<th>MessageId</th>
@@ -2875,7 +2875,7 @@ WOPI Host to editor
 	</tr>
 	</table>
 
-Editor to WOPI Host
+<h4>Editor to WOPI Host</h4>
 <table data-id='postmessage-sessions'>
 	<tr>
 		<th>MessageId</th>
@@ -2908,7 +2908,7 @@ Editor to WOPI Host
 	</table>
 
 <h3 id="loleaflet-postmessage-actions">Actions</h3>
-WOPI host to editor
+<h4>WOPI host to editor</h4>
 <table data-id='postmessage-actions'>
 	<tr>
 		<th>MessageId</th>
@@ -2991,8 +2991,7 @@ WOPI host to editor
 	</tr>
 </table>
 
-Actions response
-(WOPI editor to host)
+<h4>WOPI editor to host (Response)</h4>
 <table data-id='postmessage-actions-response'>
 	<tr>
 		<th>MessageId</th>
@@ -3035,7 +3034,7 @@ Actions response
 </table>
 
 <h3 id="loleaflet-postmessage-versioning">Version Restore</h3>
-WOPI host to editor
+<h4>WOPI host to editor</h4>
 <table data-id="postmessage-versioning-to-editor">
     <tr>
 	<th>MessageId</th>
@@ -3056,7 +3055,8 @@ WOPI host to editor
 	</td>
     </tr>
 </table>
-Editor to WOPI host
+
+<h4>Editor to WOPI host</h4>
 <table data-id="postmessage-versioning-to-host">
     <tr>
 	<th>MessageId</th>
@@ -3076,11 +3076,11 @@ Editor to WOPI host
     </tr>
 </table>
 
-<h4>Note</h4>
+<h5>Note</h5>
 <p>These messages are only emitted if <i>App_LoadingStatus</i> contains <i>VersionStates</i> in <i>Features</i>. Otherwise, host can immediately restore the version to earlier revision.</p>
 
 <h3 id='loleaflet-postmessage-misc'>Miscellaneous</h3>
-WOPI host to editor
+<h4>WOPI host to editor</h4>
 <table data-id='postmessage-misc-to-editor'>
 	<tr>
 		<th>MessageId</th>
@@ -3164,7 +3164,7 @@ WOPI host to editor
 function in <a href="https://opengrok.libreoffice.org/xref/online/loleaflet/js/toolbar.js">loleaflet/js/toolbar.js</a>.
 Note that they usually don't change but there is no guarantee that they are stable.</p>
 
-Editor to WOPI host
+<h4>Editor to WOPI host</h4>
 <table data-id='postmessage-misc-to-host'>
 	<tr>
 		<th>MessageId</th>
@@ -3203,7 +3203,7 @@ Editor to WOPI host
 </table>
 
 <h3 id='loleaflet-postmessage-python'>Calling Python scripts</h3>
-WOPI host to editor
+<h4>WOPI host to editor</h4>
 <table data-id='postmessage-python-to-editor'>
 	<tr>
 		<th>MessageId</th>
@@ -3223,7 +3223,8 @@ WOPI host to editor
 		</td>
 	</tr>
 </table>
-Editor to WOPI host
+
+<h4>Editor to WOPI host</h4>
 <table data-id='postmessage-python-to-host'>
 	<tr>
 		<th>MessageId</th>


More information about the Libreoffice-commits mailing list