[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-07-24 Thread Andras Timar (via logerrit)
 loleaflet/src/control/Toolbar.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 73d44e8af2dac141b69f7f996a73345f68dad157
Author: Andras Timar 
AuthorDate: Fri Jul 24 11:32:37 2020 +0200
Commit: Andras Timar 
CommitDate: Fri Jul 24 14:07:20 2020 +0200

fix localization of Online Help TOC

Change-Id: I2bdeeec3a24c15f6c881590f9cd11d9b13aaa011
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99308
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 1ce90a3ba..3c3059844 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -301,7 +301,7 @@ L.Map.include({
for (i = 0, max = 
translatableContent.length; i < max; i++) {

translatableContent[i].innerHTML = 
translatableContent[i].innerHTML.toLocaleString();
}
-   translatableContent = 
$vexContent.find('a'); // TOC
+   translatableContent = 
$vexContent.find('button'); // TOC
for (i = 0, max = 
translatableContent.length; i < max; i++) {

translatableContent[i].innerHTML = 
translatableContent[i].innerHTML.toLocaleString();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-07-21 Thread Szymon Kłos (via logerrit)
 loleaflet/src/map/Clipboard.js |   57 +
 1 file changed, 36 insertions(+), 21 deletions(-)

New commits:
commit f144cad3cb44fed108da0ccbfb153cb759b5cc8b
Author: Szymon Kłos 
AuthorDate: Thu Jul 16 10:29:39 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Jul 21 10:40:22 2020 +0200

clipboard: when disabled use only internal commands

When external copy/paste is disabled:
- always use internal copy/paste
- don't ask user to use keyboard shortcut
  (it's possible to paste from menu)
- content of a system clipboard is not modified at all

Change-Id: I5645ad68bbf9364124ae721ea0e889d877a4ed23
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98876
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99057
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 3e03f973b..18678b389 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -139,16 +139,6 @@ L.Clipboard = L.Class.extend({
));
},
 
-   // put in the clipboard if copy is disabled
-   _getCopyDisabledHtml: function() {
-   var lang = 'en_US'; // FIXME: l10n
-   return this._substProductName(this._originWrapBody(
-   '  \n' +
-   '\n' +
-   '  \n', false
-   ));
-   },
-
_getMetaOrigin: function (html) {
var match = 'https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-07-14 Thread Szymon Kłos (via logerrit)
 loleaflet/src/map/Clipboard.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dbc1d87699e04f03890d45d7ee8a7e73027976bf
Author: Szymon Kłos 
AuthorDate: Mon Jul 13 10:39:54 2020 +0200
Commit: Michael Meeks 
CommitDate: Tue Jul 14 16:03:27 2020 +0200

When copy disabled use empty content in clipboard

Don't use 'Stub HTML Message' title...

Change-Id: I24953f1513fb5432e614958787b9d127ffa531a7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98620
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 073efadc16d1f27809b119c9b261fabce85d1cac)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98750
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 160b664f4..3e03f973b 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -145,7 +145,7 @@ L.Clipboard = L.Class.extend({
return this._substProductName(this._originWrapBody(
'  \n' +
'\n' +
-   '  \n', true
+   '  \n', false
));
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-07-07 Thread Szymon Kłos (via logerrit)
 loleaflet/src/map/Clipboard.js |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 208d8a944906f35e7e1a0b3fdbaa077a8d44475d
Author: Szymon Kłos 
AuthorDate: Tue Jul 7 09:52:04 2020 +0200
Commit: Aron Budea 
CommitDate: Tue Jul 7 19:55:59 2020 +0200

clipboard: avoid error when localStorage is not available

In some browsers with strange settings localStorage is
not available.

Change-Id: If9e5ebeb9701cc0a2b19c5946bcbc23f76a8c577
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98238
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit ac7125b1ea4f451a4dfef0a7eed999e18ff0f51b)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98087
Reviewed-by: Aron Budea 

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 29bb77e67..160b664f4 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -786,10 +786,13 @@ L.Clipboard = L.Class.extend({
 
_userAlreadyWarned: function (warning) {
var itemKey = warning;
-   if (!localStorage.getItem(itemKey)) {
-   localStorage.setItem(itemKey, '1');
+   var storage = localStorage;
+   if (storage && !storage.getItem(itemKey)) {
+   storage.setItem(itemKey, '1');
return false;
-   }
+   } else if (!storage)
+   return false;
+
return true;
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-07-07 Thread Szymon Kłos (via logerrit)
 loleaflet/src/map/Clipboard.js |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 76030544269d6b8d03919098cb4187baf383081e
Author: Szymon Kłos 
AuthorDate: Tue Jul 7 09:31:36 2020 +0200
Commit: Aron Budea 
CommitDate: Tue Jul 7 19:55:18 2020 +0200

clipboard: no stub message when copy is disabled

When copy is disabled don't put stub message about
download button in the clipboard.
Allow internal copy & paste when copy is disabled
- so disable only external interaction.

Change-Id: Ie7864abc8a239aa068880545cf09a48155ebbaea
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98237
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 39d5d55d719730f42073df86d1103888598a9042)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98088
Reviewed-by: Aron Budea 

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index c7b604083..29bb77e67 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -139,6 +139,16 @@ L.Clipboard = L.Class.extend({
));
},
 
+   // put in the clipboard if copy is disabled
+   _getCopyDisabledHtml: function() {
+   var lang = 'en_US'; // FIXME: l10n
+   return this._substProductName(this._originWrapBody(
+   '  \n' +
+   '\n' +
+   '  \n', true
+   ));
+   },
+
_getMetaOrigin: function (html) {
var match = 'https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-06-11 Thread Muhammet Kara (via logerrit)
 loleaflet/src/control/Toolbar.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit af22ce14c3ee656f3ee246425acefe73238f563e
Author: Muhammet Kara 
AuthorDate: Thu Jun 11 01:35:15 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Jun 11 10:22:28 2020 +0200

Relax the cookie for the Welcome message

Change-Id: Ia58b6a0125ece8eb4c3a6ea14c03c7c33dfc655a

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index fdeec58af..1ce90a3ba 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -411,7 +411,7 @@ L.Map.include({
var cookiePath = '/loleaflet';
if (window.socketProxy)
cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   WSDVerCookie += '; max-age=31536000; 
SameSite=Strict; path=' + cookiePath;
+   WSDVerCookie += '; max-age=31536000; 
SameSite=Lax; path=' + cookiePath;
document.cookie = WSDVerCookie;
}
map.focus();
@@ -445,7 +445,7 @@ L.Map.include({
var cookiePath = '/loleaflet';
if (window.socketProxy)
cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Strict; path=' + cookiePath;
+   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Lax; path=' + cookiePath;
document.cookie = welcomeDisabledCookie;
 
if (calledFromMenu)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-06-08 Thread Marco Cecchetti (via logerrit)
 loleaflet/src/control/Ruler.js|7 ++-
 loleaflet/src/layer/tile/GridLayer.js |7 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 54f9727bdbf3990b02c8cc85ee36c28f20cd2cc3
Author: Marco Cecchetti 
AuthorDate: Sun May 24 19:03:47 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 22:13:13 2020 +0200

loleaflet: writer zoom flickers

Change-Id: I9186bbae55269870fc693b65c3e90b149375eba9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95496
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95766
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index b3cb520b9..040ec3442 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -409,7 +409,12 @@ L.Control.Ruler = L.Control.extend({
var firstTileXTranslate = parseInt(firstTile.style.left) - 
this._map._docLayer._tileWidthPx * columnNumber;
 
var tileContainer = 
mapPane.getElementsByClassName('leaflet-tile-container');
-   tileContainer = tileContainer[tileContainer.length - 1];
+   for (var i = 0; i < tileContainer.length; ++i) {
+   if (parseInt(tileContainer[i].style.zIndex) === 
this._map.getMaxZoom()) {
+   tileContainer = tileContainer[i];
+   break;
+   }
+   }
var tileContainerXTranslate = 
parseInt(tileContainer.style.transform.match(/\(([-0-9]*)/)[1]);
var mapPaneXTranslate = 
parseInt(mapPane.style.transform.match(/\(([-0-9]*)/)[1]);
 
diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 850981777..91dd404e8 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -211,12 +211,7 @@ L.GridLayer = L.Layer.extend({
maxZoom = this.options.maxZoom;
 
for (var z in this._levels) {
-   if (this._levels[z].el.children.length || z === zoom) {
-   this._levels[z].el.style.zIndex = maxZoom - 
Math.abs(zoom - z);
-   } else {
-   L.DomUtil.remove(this._levels[z].el);
-   delete this._levels[z];
-   }
+   this._levels[z].el.style.zIndex = maxZoom - 
Math.abs(zoom - z);
}
 
var level = this._levels[zoom],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-06-08 Thread gokaysatir (via logerrit)
 loleaflet/src/control/Ruler.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d88c28203f8c10c634e5a428281672fdc0b0b104
Author: gokaysatir 
AuthorDate: Sat May 30 11:50:34 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Jun 8 20:47:55 2020 +0200

tdf#111535 fix mispositioning bug when the page is resized.

Change-Id: I67444baa78f99558906de4e8e6c45a8b6f11bce6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95178
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95762

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index f5c3dda4d..b3cb520b9 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -418,6 +418,7 @@ L.Control.Ruler = L.Control.extend({
this._rFace.style.marginLeft = rulerOffset + 'px';
 
this.rulerOffset = rulerOffset; // Needed on different parts 
too..
+   this._updateParagraphIndentations();
},
 
_moveIndentation: function(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-06-08 Thread Tomaž Vajngerl (via logerrit)
 loleaflet/src/control/Ruler.js |   91 -
 1 file changed, 72 insertions(+), 19 deletions(-)

New commits:
commit 01a074d66e4d9786e5cf0b1cc07b9189a23726ce
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 1 23:15:11 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 20:47:02 2020 +0200

Add "delete tabstop" function to Ruler

Change-Id: I34d381f6d3e12b0444b9c7778ef6b8c87794cbd6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95341
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95750
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index a5537055e..f5c3dda4d 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -606,9 +606,30 @@ L.Control.Ruler = L.Control.extend({
this._map._socket.sendMessage('uno .uno:RulerChangeState ' + 
JSON.stringify(unoObj));
},
 
+   _getTabStopHit: function(tabstopContainer, pointX) {
+   var tabstop = null;
+   var margin = 10;
+   var tabstopDiffFromCenter = 1; // just a big initial 
condition
+
+   for (var i = 0; i < tabstopContainer.tabStops.length; i++) {
+   var current = tabstopContainer.tabStops[i];
+   var location = current.tabStopLocation;
+   if (pointX >= location.left - margin && pointX <= 
location.right + margin) {
+   var diff = Math.abs(pointX - location.center);
+   if (diff < tabstopDiffFromCenter) {
+   tabstop = current;
+   tabstopDiffFromCenter = diff;
+   }
+   }
+   }
+   return tabstop;
+   },
_initiateTabstopDrag: function(event) {
// console.log('===> _initiateTabstopDrag ' + event.type);
 
+   this.currentPositionInTwips = null;
+   this.currentTabStopIndex = null;
+
var tabstopContainer = null;
var pointX = null;
 
@@ -622,18 +643,37 @@ L.Control.Ruler = L.Control.extend({
}
tabstopContainer.tabStopMarkerBeingDragged = null;
 
+   // check if we hit any tabstop
+   var tabstop = this._getTabStopHit(tabstopContainer, pointX);
+
// Check what to do when a mouse buttons is clicked, ignore 
touch
if (event.type !== 'panstart') {
// right-click inside tabstop container
if (event.button === 2) {
-   this.currentPositionInTwips = 
this._map._docLayer._pixelsToTwips({x: pointX, y:0}).x;
+   if (tabstop == null) {
+   this.currentPositionInTwips = 
this._map._docLayer._pixelsToTwips({x: pointX, y:0}).x;
+   }
+   else {
+   this.currentTabStopIndex = 
tabstop.tabStopNumber;
+   }
+   var self = this;
$.contextMenu({
selector: 
'.loleaflet-ruler-tabstopcontainer',
className: 'loleaflet-font',
items: {
inserttabstop: {
name: _('Insert 
tabstop'),
-   callback: 
(this._insertTabstop).bind(this)
+   callback: 
(this._insertTabstop).bind(this),
+   visible: function() {
+   return 
self.currentPositionInTwips != null;
+   }
+   },
+   removetabstop: {
+   name: _('Delete 
tabstop'),
+   callback: 
(this._deleteTabstop).bind(this),
+   visible: function() {
+   return 
self.currentTabStopIndex != null;
+   }
}
}
});
@@ -646,23 +686,6 @@ L.Control.Ruler = L.Control.extend({
}
}
 
-   

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-06-01 Thread Marco Cecchetti (via logerrit)
 loleaflet/src/control/Control.LokDialog.js |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ec6f108a24bba23fd17c398079b08586bc987182
Author: Marco Cecchetti 
AuthorDate: Thu May 7 13:14:05 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 1 19:32:07 2020 +0200

leaflet: formula bar: missing text selection handles

mobile: double tap a word
double tap the next word
the new word is selected but there is no selection handles

Change-Id: I283dc1b177910605826102daaa28714c65190f4f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95225
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95263
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index a96ae309f..dfddbdfc2 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -503,6 +503,9 @@ L.Control.LokDialog = L.Control.extend({
handles.end = null;
}
 
+   if (!handles.start && !handles.end)
+   handles.draggingStopped = true;
+
if (!rectangles || rectangles.length < 1) {
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

2020-05-29 Thread mert (via logerrit)
 loleaflet/src/control/Toolbar.js |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit ac61b2e7de7fa29b9c00977313b03519e5e909a8
Author: mert 
AuthorDate: Fri May 29 17:00:25 2020 +0300
Commit: Andras Timar 
CommitDate: Fri May 29 17:20:58 2020 +0200

Fix proxy related welcome msg and help dialog problems

Fixed cookie problem with proxy too for welcome message

Change-Id: I8e3e6ccb7673bddd5c26e3d2aadd2da4ed03a2e4
Signed-off-by: mert 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95113
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 0409c9d1c..11f07f8f6 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -215,7 +215,11 @@ L.Map.include({
w = iw / 5 + 590;
}
var map = this;
-   $.get('loleaflet-help.html', function(data) {
+   var helpLocation = 'loleaflet-help.html';
+   if (window.socketProxy)
+   helpLocation = window.host + window.serviceRoot + 
'/loleaflet/dist/' + helpLocation;
+
+   $.get(helpLocation, function(data) {
var productName;
if (window.ThisIsAMobileApp) {
productName = window.MobileAppName;
@@ -403,7 +407,10 @@ L.Map.include({
if (!calledFromMenu) {
var WSDVerCookie = 'WSDWelcomeVersion=' 
+ map._socket.WSDServer.Version;
// Cookie will not expire for a year, 
and it will not be sent to other domains
-   WSDVerCookie += '; max-age=31536000; 
SameSite=Strict; path=/loleaflet';
+   var cookiePath = '/loleaflet';
+   if (window.socketProxy)
+   cookiePath = window.host + 
window.serviceRoot + cookiePath;
+   WSDVerCookie += '; max-age=31536000; 
SameSite=Strict; path=' + cookiePath;
document.cookie = WSDVerCookie;
}
map.focus();
@@ -414,7 +421,9 @@ L.Map.include({
 
showWelcomeDialog: function(calledFromMenu) {
console.log('showWelcomeDialog, calledFromMenu: ' + 
calledFromMenu);
-   var welcomeLocation = window.location.origin + 
window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/')) + 
'/welcome/welcome-' + String.locale + '.html';
+   var welcomeLocation = 'welcome/welcome-' + String.locale + 
'.html';
+   if (window.socketProxy)
+   welcomeLocation = window.host + window.serviceRoot + 
'/loleaflet/dist/' + welcomeLocation;
 
var map = this;
 
@@ -432,7 +441,10 @@ L.Map.include({
.fail(function() {
// Welcome dialog disabled in loolwsd.xml or 
nonexistant for some other reason
// Let's check back in a day (60 x 60 x 24 = 
86400 seconds)
-   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Strict; path=/loleaflet';
+   var cookiePath = '/loleaflet';
+   if (window.socketProxy)
+   cookiePath = window.host + 
window.serviceRoot + cookiePath;
+   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Strict; path=' + cookiePath;
document.cookie = welcomeDisabledCookie;
 
if (calledFromMenu)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits