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

[Henry Castro]

 loleaflet/dist/loleaflet.css                  |    4 ++++
 loleaflet/src/control/Control.CharacterMap.js |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 8317cd46f19cf01ff597358884e5e823ffd26362
Author: Henry Castro <hcastro at collabora.com>
Date:   Thu Nov 24 14:00:41 2016 -0400

    loleaflet: scrollable special character dialog

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index d2f7b80..fe40839 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -53,3 +53,7 @@ body {
 .loleaflet-controls {
 	margin-right: 10px;
 }
+
+.loleaflet-scrolled {
+	overflow: auto;
+}
diff --git a/loleaflet/src/control/Control.CharacterMap.js b/loleaflet/src/control/Control.CharacterMap.js
index 58f15e8..550fff6 100644
--- a/loleaflet/src/control/Control.CharacterMap.js
+++ b/loleaflet/src/control/Control.CharacterMap.js
@@ -331,7 +331,7 @@ L.Control.CharacterMap = L.Control.extend({
 
 
 	show: function () {
-		this._tbody.setAttribute('style', 'max-height:' + this._map.getSize().y / 2 + 'px');
+		this._content.setAttribute('style', 'max-height:' + (this._map.getSize().y - 50) + 'px');
 		this._container.style.visibility = '';
 	},
 
@@ -343,7 +343,7 @@ L.Control.CharacterMap = L.Control.extend({
 		closeButton.innerHTML = '×';
 		L.DomEvent.on(closeButton, 'click', this._onCloseClick, this);
 		var wrapper = L.DomUtil.create('div', 'leaflet-popup-content-wrapper', this._container);
-		var content = L.DomUtil.create('div', 'leaflet-popup-content', wrapper);
+		var content = this._content = L.DomUtil.create('div', 'leaflet-popup-content loleaflet-scrolled', wrapper);
 		var labelTitle = document.createElement('span');
 		labelTitle.innerHTML = '<b>' + _('Special Characters') + '</b>';
 		content.appendChild(labelTitle);