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

[Miklos Vajna]

 loleaflet/src/layer/tile/TileLayer.js |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3fabd8ae6bb1623651a8bef835f14cf3e1df9bfa
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jan 15 16:06:52 2016 +0100

    loleaflet: prefer HTML over plain text for drop purposes
    
    We iterate over an array provided by the browser, let's always use HTML
    and not plain text, even if the array contains plain text first, and
    only then HTML.
    
    (cherry picked from commit d91dd9774a98129a8c8212c171c8a89a88c2d3dd)

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index f0bd19d..036fe54 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -949,13 +949,14 @@ L.TileLayer = L.GridLayer.extend({
 		// handle content
 		var types = e.dataTransfer.types;
 		var handled = false;
+		var hasHTML = types.indexOf('text/html') > -1;
 		for (var t = 0; !handled && t < types.length; t++) {
 			var type = types[t];
 			if (type === 'text/html') {
 				this._map._socket.sendMessage('paste mimetype=text/html\n' + e.dataTransfer.getData(type));
-				// handled = true;
+				handled = true;
 			}
-			else if (type === 'text/plain') {
+			else if (type === 'text/plain' && !hasHTML) {
 				this._map._socket.sendMessage('paste mimetype=text/plain;charset=utf-8\n' + e.dataTransfer.getData(type));
 				handled = true;
 			}
commit 0d6ba0f8c78504b9e4b8f6b14d4afcd9f899466c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jan 15 15:50:49 2016 +0100

    loleaflet: fix plain text drop
    
    I don't know yet how to test HTML drop, but probably it needs the same
    fix.
    
    (cherry picked from commit 82e12a199c1a2a312df2b1670cdbcb7d63cca6af)

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index e08754f..f0bd19d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -952,12 +952,11 @@ L.TileLayer = L.GridLayer.extend({
 		for (var t = 0; !handled && t < types.length; t++) {
 			var type = types[t];
 			if (type === 'text/html') {
-				// TODO this needs loolwsd fixing, to support multiline data (blob)
-				// this._map._socket.sendMessage('paste mimetype=text/html data=' + e.dataTransfer.getData(type));
+				this._map._socket.sendMessage('paste mimetype=text/html\n' + e.dataTransfer.getData(type));
 				// handled = true;
 			}
 			else if (type === 'text/plain') {
-				this._map._socket.sendMessage('paste mimetype=text/plain;charset=utf-8 data=' + e.dataTransfer.getData(type));
+				this._map._socket.sendMessage('paste mimetype=text/plain;charset=utf-8\n' + e.dataTransfer.getData(type));
 				handled = true;
 			}
 			else if (type === 'Files') {