[Libreoffice-commits] online.git: 3 commits - loleaflet/dist loolwsd/debian loolwsd/loolwsd.spec.in

Wed Feb 17 09:42:27 UTC 2016

loleaflet/dist/loleaflet.html     |    2 +-
 loleaflet/dist/toolbar/toolbar.js |    2 +-
 loolwsd/debian/loolwsd.postinst   |    2 ++
 loolwsd/loolwsd.spec.in           |    1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a178d445cd7b139eb4f9dfe09181525adf7ac65b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Feb 17 10:42:00 2016 +0100

    loolwsd: setcap loolkit

diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 59d734f..6025356 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -5,6 +5,8 @@ set -e
 case "$1" in
     configure)
 	setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd || true
+	setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolkit || true
+	setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolbroker || true
 
 	adduser --quiet --system --group --home /opt/lool lool
 	mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 9028a2b..bae8447 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -71,6 +71,7 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name \"*.png\" -a -atime +10 -ex
 %post
 setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd
 setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolbroker
+setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolkit
 
 getent group %{group} >/dev/null || groupadd -r %{group}
 getent passwd %{owner} >/dev/null || useradd -g %{group} -r %{owner}
commit 6c761c297e749257ec02a979ef5ca85eb772c7b9
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Feb 17 10:38:43 2016 +0100

    loleaflet: use absolute URL

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index fa3971b..1fcd107 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -25,7 +25,7 @@
 <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/themes/ui-lightness/jquery-ui.css">
 <link rel="stylesheet" href="/loleaflet/dist/toolbar/evol.colorpicker.min.css">
 <link rel="localizations" href="/loleaflet/dist/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
-<link rel="localizations" href="../../dist/l10n/styles-localizations.json" type="application/vnd.oftn.l10n+json" />
+<link rel="localizations" href="/loleaflet/dist/l10n/styles-localizations.json" type="application/vnd.oftn.l10n+json" />
 <style type="text/css"></style></head>
 <body>
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
commit 4308d2a745c72a8da1df19c5e2d22dc0428c7d70
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Feb 17 09:41:49 2016 +0100

    loleaflet: indentation

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index e3665da..0600a50 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -544,7 +544,7 @@ map.on('commandstatechanged', function (e) {
 		$(".styles-select option").each(function () {
 			value = this.value;
 			if (value.toLowerCase() === state.toLowerCase()) {
-		state = value;
+				state = value;
 				found = true;
 				return;
 			}
