loleaflet/src/layer/tile/TileLayer.js | 10 +++++-----
loleaflet/src/map/Clipboard.js | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a7eab309a68944401ab1ad8869cfc3aed5d843f1
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Jul 13 10:28:54 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Jul 13 11:22:40 2020 +0200
Don't show cell selection resize handles for desktop
Change-Id: I6ac7518bd46308fffd692be576d368b5e5067fd6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98619
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 3cd53c3cf..198b511f1 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -3079,11 +3079,11 @@ L.TileLayer = L.GridLayer.extend({
},
_onUpdateCellResizeMarkers: function () {
- var singleCellOnDesktop = window.mode.isDesktop()
- &&
!this._cellSelectionArea
- &&
(this._cellCursor && !this._isEmptyRectangle(this._cellCursor));
+ var selectionOnDesktop = window.mode.isDesktop()
+ &&
(this._cellSelectionArea
+ ||
(this._cellCursor && !this._isEmptyRectangle(this._cellCursor)));
- if (!singleCellOnDesktop &&
+ if (!selectionOnDesktop &&
(this._selections.getLayers().length !== 0 ||
(this._cellCursor && !this._isEmptyRectangle(this._cellCursor)))) {
if (this._isEmptyRectangle(this._cellSelectionArea) &&
this._isEmptyRectangle(this._cellCursor)) {
return;
@@ -3119,7 +3119,7 @@ L.TileLayer = L.GridLayer.extend({
}
}
}
- else if (singleCellOnDesktop) {
+ else if (selectionOnDesktop) {
cellRectangle = this._cellSelectionArea ?
this._cellSelectionArea : this._cellCursor;
if (this._cellAutoFillArea) {
commit 073efadc16d1f27809b119c9b261fabce85d1cac
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Jul 13 10:39:54 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Jul 13 11:22:31 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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 694019246..c596cd95a 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(
' <body lang="' + lang + '" dir="ltr">\n' +
' <p></p>\n' +
- ' </body>\n', true
+ ' </body>\n', false
));
},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
