[Libreoffice-commits] online.git: loleaflet/src

Aron Budea (via logerrit) logerrit at kemper.freedesktop.org
Tue Sep 17 05:22:34 UTC 2019


 loleaflet/src/control/Control.MobileInput.js     |    2 +-
 loleaflet/src/layer/marker/ClipboardContainer.js |    2 +-
 loleaflet/src/map/Clipboard.js                   |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ed132a68b2147a296f4dd09e9d81b124054fe071
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Tue Sep 17 07:18:27 2019 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Tue Sep 17 07:22:16 2019 +0200

    loleaflet: change vex message to unsafeMessage for HTML text
    
    Change-Id: I362d3ed50f1018f85d7c97f49cb66b3d1354aee6
    Reviewed-on: https://gerrit.libreoffice.org/79030
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/control/Control.MobileInput.js b/loleaflet/src/control/Control.MobileInput.js
index 70b8c8666..005e66a28 100644
--- a/loleaflet/src/control/Control.MobileInput.js
+++ b/loleaflet/src/control/Control.MobileInput.js
@@ -330,7 +330,7 @@ L.Control.MobileInput = L.Control.extend({
 	warnCopyPaste: function() {
 		var self = this;
 		vex.dialog.alert({
-			message: _('<p>Your browser has very limited access to the clipboard</p>'),
+			unsafeMessage: _('<p>Your browser has very limited access to the clipboard</p>'),
 			callback: function () {
 				self._map.focus();
 			}
diff --git a/loleaflet/src/layer/marker/ClipboardContainer.js b/loleaflet/src/layer/marker/ClipboardContainer.js
index c532bff17..9c39ef9ec 100644
--- a/loleaflet/src/layer/marker/ClipboardContainer.js
+++ b/loleaflet/src/layer/marker/ClipboardContainer.js
@@ -71,7 +71,7 @@ L.ClipboardContainer = L.Layer.extend({
 	warnCopyPaste: function() {
 		var self = this;
 		vex.dialog.alert({
-			message: _('<p>Your browser has very limited access to the clipboard, so use these keyboard shortcuts:<ul><li><b>Ctrl+C</b>: For copying.</li><li><b>Ctrl+X</b>: For cutting.</li><li><b>Ctrl+V</b>: For pasting.</li></ul></p>'),
+			unsafeMessage: _('<p>Your browser has very limited access to the clipboard, so use these keyboard shortcuts:<ul><li><b>Ctrl+C</b>: For copying.</li><li><b>Ctrl+X</b>: For cutting.</li><li><b>Ctrl+V</b>: For pasting.</li></ul></p>'),
 			callback: function () {
 				self._map.focus();
 			}
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 079f41e9f..d079b57d5 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -762,7 +762,7 @@ L.Clipboard = L.Class.extend({
 			msg = _('<p>Your browser has very limited access to the clipboard, so use these keyboard shortcuts:<ul><li><b>Ctrl+C</b>: For copying.</li><li><b>Ctrl+X</b>: For cutting.</li><li><b>Ctrl+V</b>: For pasting.</li></ul></p>');
 		}
 		vex.dialog.alert({
-			message: msg,
+			unsafeMessage: msg,
 			callback: function () {
 				self._map.focus();
 			}
@@ -785,7 +785,7 @@ L.Clipboard = L.Class.extend({
 			    '<p>If you are copy and pasting between documents inside %productName, ' +
 			    'there is no need to download.</p>');
 		vex.dialog.alert({
-			message: this._substProductName(msg),
+			unsafeMessage: this._substProductName(msg),
 			callback: function () {
 				self._map.focus();
 			}
@@ -795,7 +795,7 @@ L.Clipboard = L.Class.extend({
 	_warnLargeCopyPasteAlreadyStarted: function () {
 		var self = this;
 		vex.dialog.alert({
-			message: _('<p>A download due to a large copy/paste operation has already started. ' +
+			unsafeMessage: _('<p>A download due to a large copy/paste operation has already started. ' +
 				   'Please, wait for the current download or cancel it before starting a new one</p>'),
 			callback: function () {
 				self._map.focus();


More information about the Libreoffice-commits mailing list