loleaflet/debug/document/loleaflet.html | 2 +-
loleaflet/dist/loleaflet.html | 2 +-
loleaflet/src/control/Toolbar.js | 2 +-
loleaflet/src/core/Socket.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 95684540ea964f33fa2bb84e7a52a1892161976d
Author: Andras Timar <andras.ti...@collabora.com>
Date: Wed Jun 22 23:46:39 2016 +0200
loleaflet: avoid ReferenceError exception when brandProductName is undefined
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 9746960..54a1d95 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -207,7 +207,7 @@ L.Map.include({
// Move the div sitting in 'body' as vex-content and make it
visible
var content = $('#about-dialog').clone().css({display:
'block'});
// fill product-name and product-string
- var productName = brandProductName || 'LibreOffice Online';
+ var productName = (typeof brandProductName !== 'undefined') ?
brandProductName : 'LibreOffice Online';
content.find('#product-name').text(productName);
var productString = _('This version of %productName is powered
by');
content.find('#product-string').text(productString.replace('%productName',
productName));
commit 80a81abc460265205ad396ff3dbe88467cda7073
Author: Andras Timar <andras.ti...@collabora.com>
Date: Wed Jun 22 23:38:06 2016 +0200
loleaflet: remove extra dist/ from URL
diff --git a/loleaflet/debug/document/loleaflet.html
b/loleaflet/debug/document/loleaflet.html
index dc3ea10..33364ce 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -29,7 +29,7 @@
<link rel="localizations" href="/loleaflet/%VERSION%/l10n/localizations.json"
type="application/vnd.oftn.l10n+json"/>
<link rel="localizations"
href="/loleaflet/%VERSION%/l10n/styles-localizations.json"
type="application/vnd.oftn.l10n+json" />
<link rel="localizations"
href="/loleaflet/%VERSION%/l10n/uno-localizations.json"
type="application/vnd.oftn.l10n+json" />
-<link rel="localizations"
href="/loleaflet/%VERSION%/dist/l10n/help-localizations.json"
type="application/vnd.oftn.l10n+json"/>
+<link rel="localizations"
href="/loleaflet/%VERSION%/l10n/help-localizations.json"
type="application/vnd.oftn.l10n+json"/>
<style type="text/css"></style></head>
<body>
<script src="/loleaflet/%VERSION%/jquery/2.1.0/jquery.min.js"></script>
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index e62f548..21cd01e 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -29,7 +29,7 @@
<link rel="localizations" href="/loleaflet/%VERSION%/l10n/localizations.json"
type="application/vnd.oftn.l10n+json"/>
<link rel="localizations"
href="/loleaflet/%VERSION%/l10n/styles-localizations.json"
type="application/vnd.oftn.l10n+json" />
<link rel="localizations"
href="/loleaflet/%VERSION%/l10n/uno-localizations.json"
type="application/vnd.oftn.l10n+json" />
-<link rel="localizations"
href="/loleaflet/%VERSION%/dist/l10n/help-localizations.json"
type="application/vnd.oftn.l10n+json"/>
+<link rel="localizations"
href="/loleaflet/%VERSION%/l10n/help-localizations.json"
type="application/vnd.oftn.l10n+json"/>
<style type="text/css"></style></head>
<body>
<script
src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js";></script>
commit 17abf005a8b3b2a128b967dc7e87db825c94d01b
Author: Andras Timar <andras.ti...@collabora.com>
Date: Wed Jun 22 23:34:27 2016 +0200
loleaflet: Collabora Office version x.y-z style in About box
LibreOffice is unaffected
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index f8b5564..8ca6002 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -139,7 +139,7 @@ L.Socket = L.Class.extend({
else if (textMsg.startsWith('lokitversion ')) {
var lokitVersionObj =
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
$('#lokit-version').text(lokitVersionObj.ProductName +
' ' +
- lokitVersionObj.ProductVersion
+ lokitVersionObj.ProductExtension +
+ lokitVersionObj.ProductVersion
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
' (git hash: ' +
lokitVersionObj.BuildId.substring(0, 7) + ')');
}
else if (textMsg.startsWith('error:') && command.errorCmd ===
'load') {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
