[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-1' - 2 commits - debian/changelog loleaflet/dist loleaflet/src loolwsd.spec.in

[Andras Timar]

 debian/changelog                      |   12 ++++++++++++
 loleaflet/dist/leaflet.css            |   17 +++++------------
 loleaflet/dist/loleaflet.css          |    1 +
 loleaflet/src/layer/tile/TileLayer.js |    5 -----
 loleaflet/src/map/Map.js              |    1 -
 loolwsd.spec.in                       |    2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 5929aa81b51a12574538f1c6113d920d97119f5b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Mar 29 12:08:34 2018 +0200

    Bump package version to 3.1.0-7
    
    Change-Id: Ia2355beeb2aecb8b46dd40516179323843b1341c

diff --git a/debian/changelog b/debian/changelog
index 743144b78..b0cfbad83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+loolwsd (3.1.0-7) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool31
+
+ -- Andras Timar <andras.timar at collabora.com>  Thu, 29 Mar 2018 19:30:00 +0200
+
+loolwsd (3.1.0-6) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool31
+
+ -- Andras Timar <andras.timar at collabora.com>  Thu, 29 Mar 2018 12:00:00 +0200
+
 loolwsd (3.1.0-5) unstable; urgency=medium
 
   * see the git log: http://col.la/cool31
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 170b88057..7f789cc16 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        5%{?dist}
+Release:        7%{?dist}
 %if 0%{?suse_version} == 1110
 Group:          Productivity/Office/Suite
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
commit 390551a96033e076669bdf772f1531496b505d79
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Mar 28 14:50:12 2018 +0200

    Revert all related loleaflet IME changes
    
    ... that can potentially affect the html/css layout. We have a problem
    in the front-end where map gets incorrectly positioned due to the moving
    candidate window. With this revert, the candidate window is thrown back
    at where it was (to the top-left) and the problem we are facing (as
    mentioned above) dissappears as well. Let's fix that problem first
    before re-revert it.
    
    Change-Id: I1b629de51fb5f82dceb007105eb4c3ee1d411d22
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index d1a615a50..c324ebfde 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -679,7 +679,7 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header {
 }
 
 .clipboard-container {
-	position: absolute;
+	position: fixed;
 	left: 0px;
 	top: 0px;
 	width: 0px;
@@ -688,18 +688,11 @@ div.leaflet-cursor-container:hover > .leaflet-cursor-header {
 	opacity: 0;
 	}
 
-input.clipboard {
+.clipboard {
 	width: 1px;
 	height: 1px;
-	padding: 0px !important; /* w2ui defines "input:not([type=button])" rule which sets
-				    the padding to non-zero. Hence, the !important. Otherwise,
-				    clipboard cursor apperas in MSIE and MSEdge */
-	border: 0px !important;
-}
-
-.clipboard:focus {
-    outline: none;
-}
+	padding: 0px;
+	}
 
 .resize-detector {
     position: absolute;
@@ -870,4 +863,4 @@ input.clipboard {
 	border-radius: 2px;
 	top: 24px;
 	color: white;
-	}
+	}
\ No newline at end of file
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 5ac2a7258..42d3357bd 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -44,6 +44,7 @@
 
 body {
     margin: 0;
+    overflow: hidden;
 }
 
 #presentation-controls-wrapper {
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 140f14993..cc7ed0587 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1443,11 +1443,6 @@ L.TileLayer = L.GridLayer.extend({
 				this._cursorMarker.setLatLng(cursorPos, pixBounds.getSize().multiplyBy(this._map.getZoomScale(this._map.getZoom())));
 			}
 			this._map.addLayer(this._cursorMarker);
-
-			// move the hidden input field with the cursor
-			var clipContainer = L.DomUtil.get('doc-clipboard-container');
-			var pos = this._map.latLngToContainerPoint(L.latLng(this._visibleCursor.getCenter())).round();
-			L.DomUtil.setPosition(clipContainer, pos);
 		}
 		else if (this._cursorMarker) {
 			this._map.removeLayer(this._cursorMarker);
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 94f60dfa9..10f5acfd2 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -693,7 +693,6 @@ L.Map = L.Evented.extend({
 		}
 
 		var textAreaContainer = L.DomUtil.create('div', 'clipboard-container', container.parentElement);
-		textAreaContainer.id = 'doc-clipboard-container';
 		this._textArea = L.DomUtil.create('input', 'clipboard', textAreaContainer);
 		this._textArea.setAttribute('type', 'text');
 		this._textArea.setAttribute('autocorrect', 'off');