[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-4' - 3 commits - loleaflet/dist loleaflet/Makefile loleaflet/src

[Mihai Varga]

 loleaflet/Makefile         |    2 +-
 loleaflet/dist/leaflet.css |    7 +++++--
 loleaflet/src/map/Map.js   |    6 +-----
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 70650a0071ade95a3e0120c7b34f9c1b0ddd80fe
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Thu Aug 20 17:28:06 2015 +0300

    loleaflet: bump version after tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 901e1ac..9697db2 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.1.32
+VERSION=1.1.33
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
commit 5671fa7a0a56de940335ffec5941768e5d8be776
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Thu Aug 20 17:27:31 2015 +0300

    loleaflet: bump version before tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index a799444..901e1ac 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.1.31
+VERSION=1.1.32
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
commit 3138c7cfe9f7924042ebaa3e8d177bd1d8a1aab4
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Thu Aug 20 17:23:02 2015 +0300

    loleaflet: fixed the iframe visibility

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index 0d063b3..2812d8f 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -69,7 +69,10 @@
 	-moz-user-select: none;
 	}
 
-.leaflet-pane         { z-index: 4; }
+.leaflet-pane {
+	z-index: 10;
+	position: relative;
+	}
 
 .leaflet-tile-pane    { z-index: 2; }
 .leaflet-overlay-pane { z-index: 4; }
@@ -678,7 +681,7 @@ a.leaflet-control-buttons:hover:first-child {
     width: 100%;
     height: 100%;
     z-index: 0;
-    visibility: hidden;
+    border: none;
 }
 
 .parts-preview {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index b935fdc..944b3f5 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -593,11 +593,7 @@ L.Map = L.Evented.extend({
 		L.DomEvent[onOff](this._textArea, 'copy keydown keypress keyup', this._handleDOMEvent, this);
 
 		if (this.options.trackResize) {
-			var target = window;
-			if (window.opener) {
-				target = this._resizeDetector.contentWindow;
-			}
-			L.DomEvent[onOff](target, 'resize', this._onResize, this);
+			L.DomEvent[onOff](this._resizeDetector.contentWindow, 'resize', this._onResize, this);
 		}
 	},