[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - loleaflet/src

Pranam Lashkari (via logerrit) logerrit at kemper.freedesktop.org
Sun Jul 5 07:22:28 UTC 2020


 loleaflet/src/layer/marker/ProgressOverlay.js |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 16cdeff880b1cbb3a9c1b80550d7994db5036e1c
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Thu Jun 18 17:56:29 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Jul 5 09:22:09 2020 +0200

    leaflet: show brand name on splashscreen
    
    Change-Id: Ie7d93a134e869e14b5e4c1f8599feb8a9e130c07
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96602
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98090
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js b/loleaflet/src/layer/marker/ProgressOverlay.js
index 7100243d8..aeebfe495 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -3,6 +3,7 @@
  * L.ProgressOverlay is used to overlay progress images over the map.
  */
 
+ /* global brandProductName */
 L.ProgressOverlay = L.Layer.extend({
 
 	options: {
@@ -51,6 +52,12 @@ L.ProgressOverlay = L.Layer.extend({
 		this._container = L.DomUtil.create('div', 'leaflet-progress-layer');
 		this._spinner = L.DomUtil.create('div', 'leaflet-progress-spinner', this._container);
 		this._spinnerCanvas = L.DomUtil.create('canvas', 'leaflet-progress-spinner-canvas', this._spinner);
+
+		var productName = (typeof brandProductName !== 'undefined') ? brandProductName : 'LibreOffice Online';
+		this._brandLabel = L.DomUtil.create('div', 'leaflet-progress-label', this._container);
+		this._brandLabel.innerHTML = productName;
+
+
 		this._label = L.DomUtil.create('div', 'leaflet-progress-label', this._container);
 		this._progress = L.DomUtil.create('div', 'leaflet-progress', this._container);
 		this._bar = L.DomUtil.create('span', '', this._progress);


More information about the Libreoffice-commits mailing list