[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/reference.html

[Andras Timar]

 loleaflet/reference.html |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 7136ee3a611c47d5daedc2eefee6cd4886453a1b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Jan 5 14:18:28 2018 +0100

    loleaflet: reference docs synced with master
    
    Change-Id: I098321bdc51442a2336fd28210c210f3e3fd745b
    Reviewed-on: https://gerrit.libreoffice.org/47470
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 9a1f39ae..7894f2a7 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -7004,7 +7004,6 @@ Popups will also be automatically opened when the layer is clicked on and closed
 
 <p>Utility functions to work with the DOM tree, used by Leaflet internally.</p>
 
->>>>>>> more layer docs
 <h3>Methods</h3>
 
 <table data-id='domutil'>
@@ -7031,6 +7030,16 @@ Popups will also be automatically opened when the layer is clicked on and closed
 		<td>Returns the value for a certain style attribute on an element, including computed values or values set through CSS.</td>
 	</tr>
 	<tr>
+		<td><code><b>setStyle</b>(
+			<nobr><HTMLElement> <i>el</i></nobr>,
+			<nobr><String> <i>style</i> )</nobr>
+			<nobr><String> <i>value</i> )</nobr>
+		</code></td>
+
+		<td><code>String</code></td>
+		<td>Sets the value for a certain style attribute on an element, including computed values or values set through CSS.</td>
+	</tr>
+	<tr>
 		<td><code><b>create</b>(
 			<nobr><String> <i>tagName</i></nobr>,
 			<nobr><String> <i>className</i></nobr>,
@@ -7042,6 +7051,18 @@ Popups will also be automatically opened when the layer is clicked on and closed
 		<td>Creates an element with <code>tagName</code>, sets the <code>className</code>, and optionally appends it to <code>container</code> element.</td>
 	</tr>
 	<tr>
+		<td><code><b>createWithId</b>(
+			<nobr><String> <i>tagName</i></nobr>,
+			<nobr><String> <i>Id</i></nobr>,
+			<nobr><HTMLElement> <i>container?</i> )</nobr>
+		</code></td>
+
+		<td><code>HTMLElement</code></td>
+
+		<td>Creates an element with <code>tagName</code>, sets the <code>id</code>, and optionally appends it to <code>container</code> element.</td>
+	</tr>
+
+	<tr>
 		<td><code><b>remove</b>(
 			<nobr><HTMLElement> <i>el</i> )</nobr>
 		</code></td>